diff --git a/src/components/InterfaceNotification.tsx b/src/components/InterfaceNotification.tsx
index 3ae17fcc..55364d09 100644
--- a/src/components/InterfaceNotification.tsx
+++ b/src/components/InterfaceNotification.tsx
@@ -8,7 +8,7 @@ interface Props {
   message: string;
   error: boolean;
   retry: boolean;
-  performTransaction: (...queries: string[]) => void;
+  performTransaction: (parallelize: boolean, ...queries: string[]) => void;
 }
 
 export default class InterfaceNotification extends React.Component<Props> {
@@ -27,7 +27,10 @@ export default class InterfaceNotification extends React.Component<Props> {
             <button
               className={"buttonlink"}
               onClick={() => {
-                this.props.performTransaction(...AppSettings.lastTransactions);
+                this.props.performTransaction(
+                  false,
+                  ...AppSettings.lastTransactions
+                );
               }}
             >
               {Locale[AppSettings.interfaceLanguage].retry}
diff --git a/src/components/modals/CreationModals.tsx b/src/components/modals/CreationModals.tsx
index 5acc5399..d03a3d39 100644
--- a/src/components/modals/CreationModals.tsx
+++ b/src/components/modals/CreationModals.tsx
@@ -29,7 +29,7 @@ export type LinkCreationConfiguration = { sourceID: string; targetID: string };
 interface Props {
   update: () => void;
   projectLanguage: string;
-  performTransaction: (...queries: string[]) => void;
+  performTransaction: (parallelize: boolean, ...queries: string[]) => void;
   elemConfiguration: ElemCreationConfiguration;
   linkConfiguration: LinkCreationConfiguration;
 }
@@ -55,6 +55,7 @@ export const CreationModals: React.FC<Props> = (props) => {
           setModalAddLink(false);
           if (selectedLink) {
             props.performTransaction(
+              true,
               ...saveNewLink(
                 selectedLink,
                 props.linkConfiguration.sourceID,
@@ -72,6 +73,7 @@ export const CreationModals: React.FC<Props> = (props) => {
           setModalAddLink(false);
           if (conceptName && vocabulary) {
             props.performTransaction(
+              true,
               ...createTerm(
                 conceptName,
                 vocabulary,
@@ -101,6 +103,7 @@ export const CreationModals: React.FC<Props> = (props) => {
           setModalAddElem(false);
           if (conceptName && vocabulary) {
             props.performTransaction(
+              true,
               ...createTerm(
                 conceptName,
                 vocabulary,
diff --git a/src/function/FunctionCache.ts b/src/function/FunctionCache.ts
index 47aea062..dd36c661 100644
--- a/src/function/FunctionCache.ts
+++ b/src/function/FunctionCache.ts
@@ -194,7 +194,8 @@ function getSubclassConnections(
     );
 }
 
-export function insertNewCacheTerms(newTerms: typeof WorkspaceTerms) {
+export function insertNewCacheTerms(newTerms: typeof WorkspaceTerms): string[] {
+  const newVocabularies: string[] = [];
   Object.assign(WorkspaceTerms, newTerms);
   for (const term in newTerms) {
     const vocab = Object.keys(CacheSearchVocabularies).find(
@@ -208,6 +209,7 @@ export function insertNewCacheTerms(newTerms: typeof WorkspaceTerms) {
             WorkspaceVocabularies[vocab].glossary === newTerms[term].inScheme
         )
       ) {
+        newVocabularies.push(vocab);
         WorkspaceVocabularies[vocab] = {
           labels: CacheSearchVocabularies[vocab].labels,
           readOnly: true,
@@ -225,6 +227,7 @@ export function insertNewCacheTerms(newTerms: typeof WorkspaceTerms) {
         `Vocabulary with glossary ${newTerms[term].inScheme} has not been found in the database; term ${term} will not be added.`
       );
   }
+  return newVocabularies;
 }
 
 export function insertNewRestrictions(values: {
diff --git a/src/function/FunctionElem.ts b/src/function/FunctionElem.ts
index 55f7b61b..78281a63 100644
--- a/src/function/FunctionElem.ts
+++ b/src/function/FunctionElem.ts
@@ -48,6 +48,7 @@ import { RepresentationConfig } from "../config/logic/RepresentationConfig";
 import { updateDeleteTriples } from "../queries/update/UpdateMiscQueries";
 import { updateCreateDiagram } from "../queries/update/UpdateDiagramQueries";
 import { fetchRestrictions, fetchTerms } from "../queries/get/FetchQueries";
+import { fetchVocabularyTermCount } from "../queries/get/CacheQueries";
 
 export function resizeElem(id: string, highlight: boolean = true) {
   let view = paper.findViewByModel(id);
@@ -303,7 +304,7 @@ export async function putElementsOnCanvas(
       );
       const terms = _.merge(
         readOnlyTerms,
-        fetchRestrictions(
+        await fetchRestrictions(
           AppSettings.contextEndpoint,
           readOnlyTerms,
           undefined,
@@ -312,7 +313,13 @@ export async function putElementsOnCanvas(
           true
         )
       );
-      insertNewCacheTerms(terms);
+      // This fetch fires only when the added read-only terms are from vocabularies
+      // not considered as part of the "project".
+      await fetchVocabularyTermCount(
+        AppSettings.contextEndpoint,
+        AppSettings.cacheContext,
+        ...insertNewCacheTerms(terms)
+      );
       insertNewRestrictions(relationships);
       const newElements = initElements(true);
       const newConnections = initConnections().add;
diff --git a/src/function/FunctionGraph.ts b/src/function/FunctionGraph.ts
index d512e709..85541598 100644
--- a/src/function/FunctionGraph.ts
+++ b/src/function/FunctionGraph.ts
@@ -43,6 +43,7 @@ import { insertNewCacheTerms, insertNewRestrictions } from "./FunctionCache";
 import { updateDiagram } from "../queries/update/UpdateDiagramQueries";
 import { addLink } from "./FunctionCreateVars";
 import { fetchRestrictions, fetchTerms } from "../queries/get/FetchQueries";
+import { fetchVocabularyTermCount } from "../queries/get/CacheQueries";
 
 export const mvp1IRI =
   "https://slovník.gov.cz/základní/pojem/má-vztažený-prvek-1";
@@ -86,7 +87,7 @@ export async function spreadConnections(
     .filter((link) => !isUrl(link))
     .map((link) => getOtherConnectionElementID(link, id));
   const iris = elements.filter((iri) => isUrl(iri));
-  let queries: string[] = [];
+  const queries: string[] = [];
   if (iris.length > 0) {
     const readOnlyTerms = await fetchTerms(
       AppSettings.contextEndpoint,
@@ -106,8 +107,12 @@ export async function spreadConnections(
         true
       )
     );
-    insertNewCacheTerms(
-      _.merge(terms, await fetchRestrictions(AppSettings.contextEndpoint))
+    await fetchVocabularyTermCount(
+      AppSettings.contextEndpoint,
+      AppSettings.cacheContext,
+      ...insertNewCacheTerms(
+        _.merge(terms, await fetchRestrictions(AppSettings.contextEndpoint))
+      )
     );
     insertNewRestrictions(
       await fetchRestrictions(
@@ -133,7 +138,7 @@ export async function spreadConnections(
     ids.forEach((id, i) => {
       const x = centerX + radius * Math.cos((i * 2 * Math.PI) / length);
       const y = centerY + radius * Math.sin((i * 2 * Math.PI) / length);
-      let newElem = new graphElement({ id: id });
+      const newElem = new graphElement({ id: id });
       newElem.position(x, y);
       WorkspaceElements[id].position[AppSettings.selectedDiagram] = {
         x: x,
diff --git a/src/interface/ContextInterface.tsx b/src/interface/ContextInterface.tsx
index a1b3766a..d2415ef8 100644
--- a/src/interface/ContextInterface.tsx
+++ b/src/interface/ContextInterface.tsx
@@ -18,7 +18,10 @@ import {
   getLinksConfig,
   getSettings,
 } from "../queries/get/InitQueries";
-import { fetchVocabularies } from "../queries/get/CacheQueries";
+import {
+  fetchVocabularies,
+  fetchVocabularyTermCount,
+} from "../queries/get/CacheQueries";
 import { qb } from "../queries/QueryBuilder";
 import {
   updateProjectElement,
@@ -31,7 +34,7 @@ import {
 } from "../function/FunctionEditVars";
 import {
   updateDeleteProjectLink,
-  updateProjectLinkParallel,
+  updateProjectLink,
 } from "../queries/update/UpdateLinkQueries";
 import { initConnections } from "../function/FunctionRestriction";
 import { insertNewCacheTerms } from "../function/FunctionCache";
@@ -81,6 +84,7 @@ export async function updateContexts(): Promise<boolean> {
     case ContextLoadingStrategy.RECONSTRUCT_WORKSPACE:
       const ret2 = await processTransaction(
         AppSettings.contextEndpoint,
+        false,
         qb.constructQuery(await reconstructApplicationContextWithDiagrams())
       );
       if (!ret2) return false;
@@ -102,6 +106,7 @@ export async function updateContexts(): Promise<boolean> {
     }
     const ret = await processTransaction(
       AppSettings.contextEndpoint,
+      false,
       qb.constructQuery(...queries)
     );
     if (!ret) return false;
@@ -112,6 +117,7 @@ export async function updateContexts(): Promise<boolean> {
   if (contextsMissingAppContexts.length > 1) {
     const ret = await processTransaction(
       AppSettings.contextEndpoint,
+      false,
       qb.constructQuery(
         ...contextsMissingAppContexts.map((context) =>
           INSERT.DATA`
@@ -129,6 +135,7 @@ export async function updateContexts(): Promise<boolean> {
   if (contextsMissingAttachments.length > 1) {
     const ret = await processTransaction(
       AppSettings.contextEndpoint,
+      false,
       qb.constructQuery(
         ...contextsMissingAttachments.map((context) =>
           INSERT.DATA`
@@ -249,11 +256,15 @@ export async function retrieveVocabularyData(): Promise<boolean> {
 }
 
 export async function retrieveContextData(): Promise<boolean> {
-  if (!(await getElementsConfig(AppSettings.contextEndpoint))) return false;
-  if (!(await getLinksConfig(AppSettings.contextEndpoint))) return false;
+  const booleans = await Promise.all([
+    getElementsConfig(AppSettings.contextEndpoint),
+    getLinksConfig(AppSettings.contextEndpoint),
+  ]);
+  if (booleans.some((b) => !b)) return false;
   const missingTerms: string[] = Object.keys(WorkspaceElements).filter(
     (id) => !(id in WorkspaceTerms)
   );
+  let newVocabularies: string[] = [];
   if (missingTerms.length > 0) {
     const terms = await fetchTerms(
       AppSettings.contextEndpoint,
@@ -281,7 +292,7 @@ export async function retrieveContextData(): Promise<boolean> {
       // "batch" finish at around the same time.
       await Promise.all(functions.splice(0, 3).map((f) => f()));
     }
-    insertNewCacheTerms(_.merge(terms, restrictions));
+    newVocabularies = insertNewCacheTerms(_.merge(terms, restrictions));
   }
   checkForObsoleteDiagrams();
   Object.keys(WorkspaceLinks)
@@ -310,16 +321,6 @@ export async function retrieveContextData(): Promise<boolean> {
       deleteConcept(id);
     });
   const elements = initElements();
-  if (
-    !(await processTransaction(
-      AppSettings.contextEndpoint,
-      qb.constructQuery(
-        updateProjectElementNames(),
-        updateProjectElement(false, ...elements)
-      )
-    ))
-  )
-    return false;
   addToFlexSearch(...Object.keys(WorkspaceElements));
   const connections = initConnections();
   for (const id of connections.del) {
@@ -330,11 +331,36 @@ export async function retrieveContextData(): Promise<boolean> {
     );
     WorkspaceLinks[id].active = false;
   }
+  const updates = await Promise.all([
+    processTransaction(
+      AppSettings.contextEndpoint,
+      false,
+      qb.constructQuery(updateProjectElementNames())
+    ),
+    processTransaction(
+      AppSettings.contextEndpoint,
+      false,
+      qb.constructQuery(updateProjectElement(false, ...elements))
+    ),
+    processTransaction(
+      AppSettings.contextEndpoint,
+      false,
+      qb.constructQuery(updateDeleteProjectLink(true, ...connections.del))
+    ),
+    fetchVocabularyTermCount(
+      AppSettings.contextEndpoint,
+      AppSettings.cacheContext,
+      ...newVocabularies
+    ),
+  ]);
+  if (updates.some((u) => !u)) return false;
+  // These updates, if run in parallel, have the ability to DoS the DB - it has to run sequentially, unfortunately.
+  // Such a large load is usually generated only on opening vocabularies for the first time, or a saving/loading error.
   return await processTransaction(
     AppSettings.contextEndpoint,
-    qb.constructQuery(updateDeleteProjectLink(true, ...connections.del)),
-    ...updateProjectLinkParallel(...connections.add).map((t) =>
-      qb.constructQuery(t)
+    false,
+    ..._.chunk(connections.add, 25).map((chunk) =>
+      qb.constructQuery(updateProjectLink(false, ...chunk))
     )
   );
 }
@@ -387,6 +413,7 @@ function checkForObsoleteDiagrams() {
         changeDiagrams();
         await processTransaction(
           AppSettings.contextEndpoint,
+          false,
           qb.constructQuery(...queries)
         );
       },
diff --git a/src/interface/TransactionInterface.ts b/src/interface/TransactionInterface.ts
index 9e22213b..fa9fd9b4 100644
--- a/src/interface/TransactionInterface.ts
+++ b/src/interface/TransactionInterface.ts
@@ -4,11 +4,14 @@ import { Environment } from "../config/Environment";
 
 export async function processTransaction(
   contextEndpoint: string,
+  parallelize: boolean,
   ...transactions: string[]
 ): Promise<boolean> {
   AppSettings.lastTransactions = transactions;
-  for (const transaction of transactions) {
-    if (!transaction) continue;
+  const connect: (transaction: string) => Promise<boolean> = async (
+    transaction: string
+  ) => {
+    if (!transaction) return true;
     const timeoutDeadline = 15000;
     const controller = new AbortController();
     const signal = controller.signal;
@@ -27,7 +30,12 @@ export async function processTransaction(
       .then((headers) => {
         let location = headers.get("location");
         if (location) return location;
-        else return undefined;
+        else {
+          console.error(
+            "Unable to fetch location header for SPARQL UPDATE query."
+          );
+          return undefined;
+        }
       })
       .catch((e) => {
         console.error(e);
@@ -76,13 +84,23 @@ export async function processTransaction(
       window.clearTimeout(timeout);
       if (resultCommit) {
         AppSettings.lastTransactionID = "";
+        return true;
       } else {
         await abortTransaction(transactionID);
         return false;
       }
     } else return false;
+  };
+  if (!parallelize) {
+    for (const t of transactions) {
+      if (!(await connect(t))) return false;
+    }
+    return true;
+  } else {
+    return await Promise.all(transactions.map((t) => connect(t))).then(
+      (booleans) => booleans.every((b) => b)
+    );
   }
-  return true;
 }
 
 export async function abortTransaction(transaction: string): Promise<boolean> {
diff --git a/src/main/App.tsx b/src/main/App.tsx
index 5a82f83c..0d01c7f3 100644
--- a/src/main/App.tsx
+++ b/src/main/App.tsx
@@ -207,7 +207,7 @@ export default class App extends React.Component<
     });
   }
 
-  performTransaction(...queries: string[]) {
+  performTransaction(parallelize: boolean, ...queries: string[]) {
     const queriesTrimmed = queries.filter((q) => q);
     if (queriesTrimmed.length === 0) {
       this.handleWorkspaceReady();
@@ -220,20 +220,22 @@ export default class App extends React.Component<
       false,
       false
     );
-    processTransaction(AppSettings.contextEndpoint, transaction).then(
-      (result) => {
-        if (result) {
-          this.handleWorkspaceReady();
-        } else {
-          this.handleStatus(
-            false,
-            Locale[AppSettings.interfaceLanguage].errorUpdating,
-            true,
-            true
-          );
-        }
+    processTransaction(
+      AppSettings.contextEndpoint,
+      parallelize,
+      transaction
+    ).then((result) => {
+      if (result) {
+        this.handleWorkspaceReady();
+      } else {
+        this.handleStatus(
+          false,
+          Locale[AppSettings.interfaceLanguage].errorUpdating,
+          true,
+          true
+        );
       }
-    );
+    });
   }
 
   handleStatus(
diff --git a/src/main/DiagramCanvas.tsx b/src/main/DiagramCanvas.tsx
index e52f897f..512c7555 100644
--- a/src/main/DiagramCanvas.tsx
+++ b/src/main/DiagramCanvas.tsx
@@ -49,7 +49,7 @@ interface Props {
   updateElementPanel: (id?: string, redoCacheSearch?: boolean) => void;
   updateDetailPanel: (mode: DetailPanelMode, id?: string) => void;
   freeze: boolean;
-  performTransaction: (...queries: string[]) => void;
+  performTransaction: (parallelize: boolean, ...queries: string[]) => void;
   handleCreation: (
     configuration: LinkCreationConfiguration | ElemCreationConfiguration
   ) => void;
@@ -99,6 +99,7 @@ export default class DiagramCanvas extends React.Component<Props, State> {
     _.pull(AppSettings.selectedElements, ...ids);
     this.props.updateElementPanel();
     this.props.performTransaction(
+      false,
       updateProjectElementDiagram(AppSettings.selectedDiagram, ...ids)
     );
   }
@@ -175,7 +176,8 @@ export default class DiagramCanvas extends React.Component<Props, State> {
         if (rect) rect.remove();
         if (!this.newLink && !evt.ctrlKey) {
           if (isElementPositionOutdated(cellView.model)) {
-            this.props.performTransaction(...moveElements(cellView.model, evt));
+            const queries = moveElements(cellView.model, evt);
+            this.props.performTransaction(queries.length < 5, ...queries);
           } else {
             resetDiagramSelection();
             highlightElement(cellView.model.id);
@@ -471,7 +473,8 @@ export default class DiagramCanvas extends React.Component<Props, State> {
         const id = cellView.model.id;
         const link = cellView.model;
         link.findView(paper).removeRedundantLinearVertices();
-        this.props.performTransaction(...updateVertices(id, link.vertices()));
+        const queries = updateVertices(id, link.vertices());
+        this.props.performTransaction(queries.length < 5, ...queries);
       },
       /**
        * Pointer double-click on link:
@@ -481,7 +484,8 @@ export default class DiagramCanvas extends React.Component<Props, State> {
         const id = cellView.model.id;
         const link = cellView.model;
         link.findView(paper).removeRedundantLinearVertices();
-        this.props.performTransaction(...updateVertices(id, link.vertices()));
+        const queries = updateVertices(id, link.vertices());
+        this.props.performTransaction(queries.length < 5, ...queries);
       },
     });
 
@@ -543,7 +547,7 @@ export default class DiagramCanvas extends React.Component<Props, State> {
           onDrop={(event) => {
             putElementsOnCanvas(event, this.props.handleStatus).then(
               (queries) => {
-                this.props.performTransaction(...queries);
+                this.props.performTransaction(false, ...queries);
                 this.props.updateElementPanel(undefined, true);
               }
             );
diff --git a/src/panels/DetailPanel.tsx b/src/panels/DetailPanel.tsx
index 9dfd93af..c39cb440 100644
--- a/src/panels/DetailPanel.tsx
+++ b/src/panels/DetailPanel.tsx
@@ -20,7 +20,7 @@ import { ResizableBox } from "react-resizable";
 interface Props {
   projectLanguage: string;
   update: Function;
-  performTransaction: (...queries: string[]) => void;
+  performTransaction: (parallelize: boolean, ...queries: string[]) => void;
   freeze: boolean;
   handleCreation: Function;
   updateDiagramCanvas: Function;
diff --git a/src/panels/DiagramPanel.tsx b/src/panels/DiagramPanel.tsx
index 979ae9ae..6b2556dd 100644
--- a/src/panels/DiagramPanel.tsx
+++ b/src/panels/DiagramPanel.tsx
@@ -5,7 +5,7 @@ import DiagramTab from "./diagram/DiagramTab";
 import ModalRemoveDiagram from "./modal/ModalRemoveDiagram";
 
 interface Props {
-  performTransaction: (...queries: string[]) => void;
+  performTransaction: (parallelize: boolean, ...queries: string[]) => void;
   freeze: boolean;
   update: Function;
 }
diff --git a/src/panels/MenuPanel.tsx b/src/panels/MenuPanel.tsx
index a7cc5c0a..589f4be1 100644
--- a/src/panels/MenuPanel.tsx
+++ b/src/panels/MenuPanel.tsx
@@ -30,7 +30,7 @@ interface MenuPanelProps {
   validate: Function;
   closeDetailPanel: Function;
   handleStatus: Function;
-  performTransaction: (...queries: string[]) => void;
+  performTransaction: (parallelize: boolean, ...queries: string[]) => void;
   retry: boolean;
   tooltip: boolean;
 }
diff --git a/src/panels/VocabularyPanel.tsx b/src/panels/VocabularyPanel.tsx
index 95fe3fc8..88a19db5 100644
--- a/src/panels/VocabularyPanel.tsx
+++ b/src/panels/VocabularyPanel.tsx
@@ -37,7 +37,7 @@ import { isElementVisible } from "../function/FunctionElem";
 
 interface Props {
   projectLanguage: string;
-  performTransaction: (...queries: string[]) => void;
+  performTransaction: (parallelize: boolean, ...queries: string[]) => void;
   updateDetailPanel: Function;
   freeze: boolean;
   update: Function;
diff --git a/src/panels/detail/DetailElement.tsx b/src/panels/detail/DetailElement.tsx
index 647da64e..5a4d30f1 100644
--- a/src/panels/detail/DetailElement.tsx
+++ b/src/panels/detail/DetailElement.tsx
@@ -8,7 +8,7 @@ import { DetailElementLinksCard } from "./components/element/DetailElementLinksC
 interface Props {
   projectLanguage: string;
   save: (id: string) => void;
-  performTransaction: (...queries: string[]) => void;
+  performTransaction: (parallelize: boolean, ...queries: string[]) => void;
   error: boolean;
   handleCreation: Function;
   updateDetailPanel: (mode: DetailPanelMode, id?: string) => void;
diff --git a/src/panels/detail/DetailLink.tsx b/src/panels/detail/DetailLink.tsx
index 2eb3cd12..ffdda5a0 100644
--- a/src/panels/detail/DetailLink.tsx
+++ b/src/panels/detail/DetailLink.tsx
@@ -39,7 +39,7 @@ import { setFullLinksCardinalitiesFromCompactLink } from "../../function/Functio
 interface Props {
   projectLanguage: string;
   save: (id: string) => void;
-  performTransaction: (...queries: string[]) => void;
+  performTransaction: (parallelize: boolean, ...queries: string[]) => void;
   error: boolean;
   updateDetailPanel: (mode: DetailPanelMode, id?: string) => void;
   id: string;
@@ -235,7 +235,7 @@ export default class DetailLink extends React.Component<Props, State> {
       queries.push(updateProjectLink(true, this.props.id));
       this.setState({ changes: false });
       this.props.save(this.props.id);
-      this.props.performTransaction(...queries);
+      this.props.performTransaction(true, ...queries);
     }
   }
 
@@ -390,89 +390,93 @@ export default class DetailLink extends React.Component<Props, State> {
                     }))
                   }
                 />
-                {(AppSettings.representation === Representation.COMPACT
-                  && this.props.id in WorkspaceLinks
-                  && WorkspaceLinks[this.props.id].type === LinkType.DEFAULT) && (
-                  <div>
-                    <h5>
-                      {
-                        <IRILink
-                          label={
-                            Locale[AppSettings.interfaceLanguage]
-                              .detailPanelAltLabel
-                          }
-                          iri={"http://www.w3.org/2004/02/skos/core#altLabel"}
-                        />
-                      }
-                    </h5>
-                    <AltLabelTable
-                      labels={this.state.inputAltLabels}
-                      readOnly={this.state.readOnly}
-                      onEdit={(textarea: string, lang: string, i: number) => {
-                        let res = this.state.inputAltLabels;
-                        let resL = this.state.selectedLabel;
-                        if (textarea === "") {
-                          if (
-                            res[i].label ===
-                            this.state.selectedLabel[this.props.projectLanguage]
-                          ) {
-                            resL[this.props.projectLanguage] =
-                              WorkspaceTerms[
-                                WorkspaceLinks[this.props.id].iri
-                              ].labels[this.props.projectLanguage];
-                          }
-                          res.splice(i, 1);
-                        } else {
-                          if (
-                            res[i].label ===
-                            this.state.selectedLabel[this.props.projectLanguage]
-                          ) {
-                            resL[this.props.projectLanguage] =
-                              lang === this.props.projectLanguage
-                                ? textarea
-                                : "";
-                          }
-                          res[i] = { label: textarea, language: lang };
+                {AppSettings.representation === Representation.COMPACT &&
+                  this.props.id in WorkspaceLinks &&
+                  WorkspaceLinks[this.props.id].type === LinkType.DEFAULT && (
+                    <div>
+                      <h5>
+                        {
+                          <IRILink
+                            label={
+                              Locale[AppSettings.interfaceLanguage]
+                                .detailPanelAltLabel
+                            }
+                            iri={"http://www.w3.org/2004/02/skos/core#altLabel"}
+                          />
                         }
-                        this.setState({
-                          inputAltLabels: res,
-                          selectedLabel: resL,
-                          changes: true,
-                        });
-                      }}
-                      default={
-                        this.state.selectedLabel[this.props.projectLanguage]
-                      }
-                      selectAsDefault={(lang: string, i: number) => {
-                        let res = this.state.selectedLabel;
-                        res[this.props.projectLanguage] =
-                          this.state.inputAltLabels[i].label;
-                        this.setState({
-                          selectedLabel: res,
-                          changes: true,
-                        });
-                      }}
-                      addAltLabel={(label: string) => {
-                        if (
-                          label !== "" ||
-                          this.state.inputAltLabels.find(
-                            (alt) => alt.label === label
-                          )
-                        ) {
+                      </h5>
+                      <AltLabelTable
+                        labels={this.state.inputAltLabels}
+                        readOnly={this.state.readOnly}
+                        onEdit={(textarea: string, lang: string, i: number) => {
                           let res = this.state.inputAltLabels;
-                          res.push({
-                            label: label,
-                            language: this.props.projectLanguage,
-                          });
+                          let resL = this.state.selectedLabel;
+                          if (textarea === "") {
+                            if (
+                              res[i].label ===
+                              this.state.selectedLabel[
+                                this.props.projectLanguage
+                              ]
+                            ) {
+                              resL[this.props.projectLanguage] =
+                                WorkspaceTerms[
+                                  WorkspaceLinks[this.props.id].iri
+                                ].labels[this.props.projectLanguage];
+                            }
+                            res.splice(i, 1);
+                          } else {
+                            if (
+                              res[i].label ===
+                              this.state.selectedLabel[
+                                this.props.projectLanguage
+                              ]
+                            ) {
+                              resL[this.props.projectLanguage] =
+                                lang === this.props.projectLanguage
+                                  ? textarea
+                                  : "";
+                            }
+                            res[i] = { label: textarea, language: lang };
+                          }
                           this.setState({
                             inputAltLabels: res,
+                            selectedLabel: resL,
                             changes: true,
                           });
+                        }}
+                        default={
+                          this.state.selectedLabel[this.props.projectLanguage]
                         }
-                      }}
-                    />
-                  </div>
-                )}
+                        selectAsDefault={(lang: string, i: number) => {
+                          let res = this.state.selectedLabel;
+                          res[this.props.projectLanguage] =
+                            this.state.inputAltLabels[i].label;
+                          this.setState({
+                            selectedLabel: res,
+                            changes: true,
+                          });
+                        }}
+                        addAltLabel={(label: string) => {
+                          if (
+                            label !== "" ||
+                            this.state.inputAltLabels.find(
+                              (alt) => alt.label === label
+                            )
+                          ) {
+                            let res = this.state.inputAltLabels;
+                            res.push({
+                              label: label,
+                              language: this.props.projectLanguage,
+                            });
+                            this.setState({
+                              inputAltLabels: res,
+                              changes: true,
+                            });
+                          }
+                        }}
+                      />
+                    </div>
+                  )}
                 <h5>
                   {
                     <IRILink
diff --git a/src/panels/detail/DetailMultipleLinks.tsx b/src/panels/detail/DetailMultipleLinks.tsx
index 9fc51fe5..8711ba67 100644
--- a/src/panels/detail/DetailMultipleLinks.tsx
+++ b/src/panels/detail/DetailMultipleLinks.tsx
@@ -29,7 +29,7 @@ type Props = {
   updateDetailPanel: (mode: DetailPanelMode, id?: string) => void;
   projectLanguage: string;
   save: (...ids: string[]) => void;
-  performTransaction: (...queries: string[]) => void;
+  performTransaction: (parallelize: boolean, ...queries: string[]) => void;
 };
 
 type State = {
@@ -183,7 +183,7 @@ export default class DetailMultipleLinks extends React.Component<Props, State> {
       queries.push(updateProjectLink(true, ...AppSettings.selectedLinks));
       this.setState({ changes: false });
       this.props.save(...AppSettings.selectedLinks);
-      this.props.performTransaction(...queries);
+      this.props.performTransaction(true, ...queries);
     }
   }
 
diff --git a/src/panels/detail/components/connections/ConnectionList.tsx b/src/panels/detail/components/connections/ConnectionList.tsx
index 329ef3bd..9e3a7d23 100644
--- a/src/panels/detail/components/connections/ConnectionList.tsx
+++ b/src/panels/detail/components/connections/ConnectionList.tsx
@@ -26,7 +26,7 @@ interface Props {
   //Element ID from DetailElement
   id: string;
   projectLanguage: string;
-  performTransaction: (...queries: string[]) => void;
+  performTransaction: (parallelize: boolean, ...queries: string[]) => void;
 }
 
 interface State {
@@ -212,7 +212,10 @@ export default class ConnectionList extends React.Component<Props, State> {
               onClick={() => {
                 spreadConnections(this.props.id, this.state.selected).then(
                   (queries) => {
-                    this.props.performTransaction(...queries);
+                    this.props.performTransaction(
+                      queries.length < 8,
+                      ...queries
+                    );
                     this.getConnectionsFromOtherVocabularies();
                     this.setState({ selected: [] });
                   }
diff --git a/src/panels/detail/components/element/DetailElementDescriptionCard.tsx b/src/panels/detail/components/element/DetailElementDescriptionCard.tsx
index 669ccdbf..2165d165 100644
--- a/src/panels/detail/components/element/DetailElementDescriptionCard.tsx
+++ b/src/panels/detail/components/element/DetailElementDescriptionCard.tsx
@@ -44,7 +44,7 @@ import { updateProjectElement } from "../../../../queries/update/UpdateElementQu
 
 type Props = {
   id: string;
-  performTransaction: (...queries: string[]) => void;
+  performTransaction: (parallelize: boolean, ...queries: string[]) => void;
   updateDetailPanel: (mode: DetailPanelMode, id?: string) => void;
   projectLanguage: string;
   handleCreation: Function;
@@ -179,7 +179,10 @@ export class DetailElementDescriptionCard extends React.Component<
       if (elem) resizeElem(this.props.id);
       this.props.save(this.props.id);
       this.setState({ changes: false });
-      this.props.performTransaction(updateProjectElement(true, this.props.id));
+      this.props.performTransaction(
+        false,
+        updateProjectElement(true, this.props.id)
+      );
     }
   }
 
@@ -336,13 +339,17 @@ export class DetailElementDescriptionCard extends React.Component<
                         WorkspaceLinks[link].target === id ||
                         WorkspaceLinks[link].source === id
                     )) {
-                      this.props.performTransaction(...deleteConnections(conn));
+                      this.props.performTransaction(
+                        true,
+                        ...deleteConnections(conn)
+                      );
                     }
                     redrawElement(this.props.id, this.props.projectLanguage);
                   }}
                   onAdd={(id: string) => {
                     const link = getNewLink(LinkType.DEFAULT);
                     this.props.performTransaction(
+                      true,
                       ...updateConnection(
                         this.props.id,
                         id,
diff --git a/src/panels/detail/components/element/DetailElementLinksCard.tsx b/src/panels/detail/components/element/DetailElementLinksCard.tsx
index c155b935..dd02ec31 100644
--- a/src/panels/detail/components/element/DetailElementLinksCard.tsx
+++ b/src/panels/detail/components/element/DetailElementLinksCard.tsx
@@ -6,7 +6,7 @@ import { Representation } from "../../../../config/Enum";
 
 type Props = {
   id: string;
-  performTransaction: (...queries: string[]) => void;
+  performTransaction: (parallelize: boolean, ...queries: string[]) => void;
   projectLanguage: string;
 };
 
diff --git a/src/panels/diagram/DiagramAdd.tsx b/src/panels/diagram/DiagramAdd.tsx
index 0bb4130a..51cd81ec 100644
--- a/src/panels/diagram/DiagramAdd.tsx
+++ b/src/panels/diagram/DiagramAdd.tsx
@@ -10,7 +10,7 @@ import { Representation } from "../../config/Enum";
 
 interface Props {
   update: Function;
-  performTransaction: (...queries: string[]) => void;
+  performTransaction: (parallelize: boolean, ...queries: string[]) => void;
 }
 
 interface State {}
diff --git a/src/panels/diagram/DiagramTab.tsx b/src/panels/diagram/DiagramTab.tsx
index 5d4e17a8..6abd98cc 100644
--- a/src/panels/diagram/DiagramTab.tsx
+++ b/src/panels/diagram/DiagramTab.tsx
@@ -12,7 +12,7 @@ interface Props {
   diagram: string;
   update: Function;
   deleteDiagram: Function;
-  performTransaction: (...queries: string[]) => void;
+  performTransaction: (parallelize: boolean, ...queries: string[]) => void;
 }
 
 interface State {}
@@ -33,7 +33,7 @@ export default class DiagramTab extends React.Component<Props, State> {
         queries.push(updateCreateDiagram(this.props.diagram));
       }
       queries.push(updateDiagram(this.props.diagram));
-      this.props.performTransaction(...queries);
+      this.props.performTransaction(true, ...queries);
       this.forceUpdate();
       this.props.update();
     }
diff --git a/src/panels/menu/left/MenuPanelSettings.tsx b/src/panels/menu/left/MenuPanelSettings.tsx
index 396de225..0fca5770 100644
--- a/src/panels/menu/left/MenuPanelSettings.tsx
+++ b/src/panels/menu/left/MenuPanelSettings.tsx
@@ -9,7 +9,7 @@ import { MenuPanelChangeDefaultCardinality } from "../settings/MenuPanelChangeDe
 
 interface Props {
   update: Function;
-  performTransaction: (...queries: string[]) => void;
+  performTransaction: (parallelize: boolean, ...queries: string[]) => void;
   handleChangeLanguage: (language: string) => void;
   handleChangeInterfaceLanguage: (language: string) => void;
 }
diff --git a/src/panels/menu/left/MenuPanelSwitchRepresentation.tsx b/src/panels/menu/left/MenuPanelSwitchRepresentation.tsx
index 8e17ec47..61a9cb0f 100644
--- a/src/panels/menu/left/MenuPanelSwitchRepresentation.tsx
+++ b/src/panels/menu/left/MenuPanelSwitchRepresentation.tsx
@@ -8,7 +8,7 @@ import { Representation } from "../../../config/Enum";
 interface Props {
   update: Function;
   close: Function;
-  performTransaction: (...queries: string[]) => void;
+  performTransaction: (parallelize: boolean, ...queries: string[]) => void;
 }
 
 interface State {
@@ -38,7 +38,7 @@ export default class MenuPanelSwitchRepresentation extends React.Component<
         this.setState({ alert: false });
       }, 3000);
     }
-    this.props.performTransaction(...result.transaction);
+    this.props.performTransaction(false, ...result.transaction);
     this.props.close();
     this.props.update();
     this.forceUpdate();
diff --git a/src/panels/menu/settings/MenuPanelSwitchColors.tsx b/src/panels/menu/settings/MenuPanelSwitchColors.tsx
index 066afe7e..18c84592 100644
--- a/src/panels/menu/settings/MenuPanelSwitchColors.tsx
+++ b/src/panels/menu/settings/MenuPanelSwitchColors.tsx
@@ -10,7 +10,7 @@ import { updateApplicationContext } from "../../../queries/update/UpdateMiscQuer
 
 interface Props {
   update: Function;
-  performTransaction: (...queries: string[]) => void;
+  performTransaction: (parallelize: boolean, ...queries: string[]) => void;
 }
 
 interface State {}
@@ -31,7 +31,7 @@ export default class MenuPanelSwitchColors extends React.Component<
           AppSettings.representation
         )
       );
-    this.props.performTransaction(updateApplicationContext());
+    this.props.performTransaction(false, updateApplicationContext());
     this.props.update();
     this.forceUpdate();
   }
diff --git a/src/panels/modal/ModalRemoveConcept.tsx b/src/panels/modal/ModalRemoveConcept.tsx
index ab4d128d..5305cfe8 100644
--- a/src/panels/modal/ModalRemoveConcept.tsx
+++ b/src/panels/modal/ModalRemoveConcept.tsx
@@ -20,7 +20,7 @@ interface Props {
   id: string;
   close: Function;
   update: Function;
-  performTransaction: (...queries: string[]) => void;
+  performTransaction: (parallelize: boolean, ...queries: string[]) => void;
   projectLanguage: string;
 }
 
@@ -42,6 +42,7 @@ export default class ModalRemoveConcept extends React.Component<Props, State> {
       .filter((vocab) => !WorkspaceVocabularies[vocab].readOnly)
       .map((vocab) => WorkspaceVocabularies[vocab].graph);
     this.props.performTransaction(
+      true,
       ...deleteConcept(this.props.id),
       updateDeleteTriples(
         this.props.id,
diff --git a/src/panels/modal/ModalRemoveDiagram.tsx b/src/panels/modal/ModalRemoveDiagram.tsx
index f7f1c604..bd83e0c4 100644
--- a/src/panels/modal/ModalRemoveDiagram.tsx
+++ b/src/panels/modal/ModalRemoveDiagram.tsx
@@ -10,7 +10,7 @@ interface Props {
   diagram: string;
   close: Function;
   update: Function;
-  performTransaction: (...queries: string[]) => void;
+  performTransaction: (parallelize: boolean, ...queries: string[]) => void;
 }
 
 export default class ModalRemoveDiagram extends React.Component<Props> {
@@ -20,7 +20,10 @@ export default class ModalRemoveDiagram extends React.Component<Props> {
       changeDiagrams();
     }
     this.props.update();
-    this.props.performTransaction(updateDeleteDiagram(this.props.diagram));
+    this.props.performTransaction(
+      false,
+      updateDeleteDiagram(this.props.diagram)
+    );
   }
 
   render() {
diff --git a/src/panels/modal/ModalRemoveReadOnlyConcept.tsx b/src/panels/modal/ModalRemoveReadOnlyConcept.tsx
index f55a7c56..cdf35ac7 100644
--- a/src/panels/modal/ModalRemoveReadOnlyConcept.tsx
+++ b/src/panels/modal/ModalRemoveReadOnlyConcept.tsx
@@ -9,7 +9,7 @@ interface Props {
   id: string;
   close: Function;
   update: Function;
-  performTransaction: (...queries: string[]) => void;
+  performTransaction: (parallelize: boolean, ...queries: string[]) => void;
 }
 
 interface State {}
@@ -48,6 +48,7 @@ export default class ModalRemoveReadOnlyConcept extends React.Component<
             onSubmit={(event) => {
               event.preventDefault();
               this.props.performTransaction(
+                true,
                 ...removeReadOnlyElement(this.props.id)
               );
               this.props.close();
diff --git a/src/queries/get/CacheQueries.ts b/src/queries/get/CacheQueries.ts
index d65f306a..d046586b 100644
--- a/src/queries/get/CacheQueries.ts
+++ b/src/queries/get/CacheQueries.ts
@@ -7,12 +7,74 @@ import {
   initLanguageObject,
   parsePrefix,
 } from "../../function/FunctionEditVars";
-import { AppSettings } from "../../config/Variables";
-import { Representation } from "../../config/Enum";
+import { AppSettings, WorkspaceVocabularies } from "../../config/Variables";
 import _ from "lodash";
 import { createCount } from "../../function/FunctionCreateVars";
+import { Representation } from "../../config/Enum";
 import { RepresentationConfig } from "../../config/logic/RepresentationConfig";
 
+export async function fetchVocabularyTermCount(
+  endpoint: string,
+  context: string,
+  ...vocabularies: string[]
+): Promise<boolean> {
+  const vocabs = _.intersection(
+    _.uniq(
+      Object.keys(CacheSearchVocabularies).concat(
+        Object.keys(WorkspaceVocabularies)
+      )
+    ),
+    vocabularies
+  );
+  if (!vocabs) return true;
+  const query = [
+    "PREFIX skos: <http://www.w3.org/2004/02/skos/core#> ",
+    "SELECT ?vocabulary ?scheme ?title ?namespace ?term ?type where {",
+    "graph <" + context + "> {",
+    "<" +
+      context +
+      "> <https://slovník.gov.cz/datový/pracovní-prostor/pojem/odkazuje-na-kontext> ?vocabulary.}",
+    "graph ?vocabulary {",
+    "?term skos:inScheme ?scheme.",
+    "?term a ?type.",
+    "}}",
+  ].join(" ");
+  const count: { [key: string]: { [key: string]: string[] } } = {};
+  return await processQuery(endpoint, query)
+    .then((response) => response.json())
+    .then((data) => {
+      if (data.results.bindings.length === 0) return false;
+      for (const row of data.results.bindings) {
+        if (!(row.vocabulary.value in count)) {
+          count[row.vocabulary.value] = {};
+        }
+        if (!(row.term.value in count[row.vocabulary.value])) {
+          count[row.vocabulary.value][row.term.value] = [];
+          CacheSearchVocabularies[row.vocabulary.value].count[
+            Representation.FULL
+          ]++;
+        }
+        if (
+          RepresentationConfig[
+            Representation.COMPACT
+          ].visibleStereotypes.includes(row.type.value)
+        )
+          count[row.vocabulary.value][row.term.value].push(row.type.value);
+      }
+      Object.keys(count).forEach((vocab) => {
+        CacheSearchVocabularies[vocab].count[Representation.COMPACT] +=
+          Object.keys(count[vocab]).filter(
+            (term) => _.uniq(count[vocab][term]).length > 0
+          ).length;
+      });
+      return true;
+    })
+    .catch((e) => {
+      console.error(e);
+      return false;
+    });
+}
+
 export async function fetchVocabularies(
   endpoint: string,
   context: string
@@ -25,7 +87,7 @@ export async function fetchVocabularies(
       context +
       "> <https://slovník.gov.cz/datový/pracovní-prostor/pojem/odkazuje-na-kontext> ?vocabulary.}",
     "graph ?vocabulary {",
-    "OPTIONAL {?vocabulary <http://purl.org/vocab/vann/preferredNamespaceUri> ?namespace.}",
+    "?vocabulary <http://purl.org/vocab/vann/preferredNamespaceUri> ?namespace.",
     "OPTIONAL {?vocabulary ?hasAttachmentPredicate ?diagram.",
     `VALUES ?hasAttachmentPredicate {<${[
       parsePrefix("a-popis-dat-pojem", "má-přílohu"),
@@ -33,11 +95,8 @@ export async function fetchVocabularies(
     ].join("> <")}>}}`,
     "?vocabulary <http://onto.fel.cvut.cz/ontologies/slovník/agendový/popis-dat/pojem/má-glosář> ?scheme.",
     "?vocabulary <http://purl.org/dc/terms/title> ?title.",
-    "?term skos:inScheme ?scheme.",
-    "?term a ?type.",
     "}}",
   ].join(" ");
-  const count: { [key: string]: { [key: string]: string[] } } = {};
   return await processQuery(endpoint, query)
     .then((response) => response.json())
     .then((data) => {
@@ -51,7 +110,6 @@ export async function fetchVocabularies(
             count: createCount(),
             diagrams: [],
           };
-          count[row.vocabulary.value] = {};
         }
         if (
           row.diagram &&
@@ -65,25 +123,7 @@ export async function fetchVocabularies(
         CacheSearchVocabularies[row.vocabulary.value].labels[
           row.title["xml:lang"]
         ] = row.title.value;
-        if (!(row.term.value in count[row.vocabulary.value])) {
-          count[row.vocabulary.value][row.term.value] = [];
-          CacheSearchVocabularies[row.vocabulary.value].count[
-            Representation.FULL
-          ]++;
-        }
-        if (
-          RepresentationConfig[
-            Representation.COMPACT
-          ].visibleStereotypes.includes(row.type.value)
-        )
-          count[row.vocabulary.value][row.term.value].push(row.type.value);
       }
-      Object.keys(count).forEach((vocab) => {
-        CacheSearchVocabularies[vocab].count[Representation.COMPACT] =
-          Object.keys(count[vocab]).filter(
-            (term) => _.uniq(count[vocab][term]).length > 0
-          ).length;
-      });
       return true;
     })
     .catch((e) => {
diff --git a/src/queries/get/InitQueries.ts b/src/queries/get/InitQueries.ts
index d5720ab1..06a957c7 100644
--- a/src/queries/get/InitQueries.ts
+++ b/src/queries/get/InitQueries.ts
@@ -43,121 +43,119 @@ export async function getElementsConfig(
     "}}",
   ].join(`
   `);
-  const appContextElementRetrieval = await processQuery(
-    contextEndpoint,
-    appContextQuery
-  )
-    .then((response) => {
-      return response.json();
-    })
-    .then((data) => {
-      for (const result of data.results.bindings) {
-        const iri = result.elem.value;
-        if (!(iri in elements)) {
-          elements[iri] = {
-            active: result.active.value === "true",
-            diagramPosition: {},
-            hidden: {},
-            selectedName: initLanguageObject(""),
-            scheme: result.scheme.value,
-          };
-        }
-        if (
-          result.name &&
-          result.name.value &&
-          !elements[iri].selectedName[result.name["xml:lang"]]
-        )
-          elements[iri].selectedName[result.name["xml:lang"]] =
-            result.name.value;
-        if (result.vocabulary)
-          elements[iri].vocabulary = result.vocabulary.value;
-      }
-      return true;
-    })
-    .catch((e) => {
-      console.error(e);
-      return false;
-    });
-  if (!appContextElementRetrieval) return false;
-  else {
-    const diagramContextQuery = [
-      "PREFIX og: <http://onto.fel.cvut.cz/ontologies/application/ontoGrapher/>",
-      "select ?diagram ?graph ?diagramID ?iri ?posX ?posY ?hidden where {",
-      "graph ?graph {",
-      "?iri og:position-x ?posX.",
-      "?iri og:position-y ?posY.",
-      "?iri og:hidden ?hidden.",
-      "?diagram og:id ?diagramID.",
-      "?diagram og:representation ?representation .",
-      "}",
-      `?contextIRI ${qb.i(
-        parsePrefix("a-popis-dat-pojem", `má-přílohu`)
-      )} ?graph.`,
-      `values ?contextIRI {<${AppSettings.contextIRIs.join("> <")}>}`,
-      "}",
-    ].join(`
+  const diagramContextQuery = [
+    "PREFIX og: <http://onto.fel.cvut.cz/ontologies/application/ontoGrapher/>",
+    "select ?diagram ?graph ?diagramID ?iri ?posX ?posY ?hidden where {",
+    "graph ?graph {",
+    "?iri og:position-x ?posX.",
+    "?iri og:position-y ?posY.",
+    "?iri og:hidden ?hidden.",
+    "?diagram og:id ?diagramID.",
+    "?diagram og:representation ?representation .",
+    "}",
+    `?contextIRI ${qb.i(
+      parsePrefix("a-popis-dat-pojem", `má-přílohu`)
+    )} ?graph.`,
+    `values ?contextIRI {<${AppSettings.contextIRIs.join("> <")}>}`,
+    "}",
+  ].join(`
     `);
-    const diagramContextElementRetrieval = await processQuery(
-      contextEndpoint,
-      diagramContextQuery
-    )
+  const booleans = await Promise.all([
+    processQuery(contextEndpoint, appContextQuery)
       .then((response) => {
         return response.json();
       })
       .then((data) => {
         for (const result of data.results.bindings) {
-          const iri = result.iri.value;
-          if (iri in elements) {
-            if (!(result.diagramID.value in elements[iri].hidden)) {
-              elements[iri].diagramPosition[result.diagramID.value] = {
-                x: parseInt(result.posX.value),
-                y: parseInt(result.posY.value),
-              };
-              elements[iri].hidden[result.diagramID.value] =
-                result.hidden.value === "true";
-            }
+          const iri = result.elem.value;
+          if (!(iri in elements)) {
+            elements[iri] = {
+              active: result.active.value === "true",
+              diagramPosition: {},
+              hidden: {},
+              selectedName: initLanguageObject(""),
+              scheme: result.scheme.value,
+            };
           }
+          if (
+            result.name &&
+            result.name.value &&
+            !elements[iri].selectedName[result.name["xml:lang"]]
+          )
+            elements[iri].selectedName[result.name["xml:lang"]] =
+              result.name.value;
+          if (result.vocabulary)
+            elements[iri].vocabulary = result.vocabulary.value;
         }
         return true;
       })
       .catch((e) => {
         console.error(e);
         return false;
-      });
-    if (!diagramContextElementRetrieval) return false;
-    else {
-      for (const iri in elements) {
-        if (
-          !Object.keys(WorkspaceVocabularies)
-            .map((vocab) => WorkspaceVocabularies[vocab].glossary)
-            .includes(elements[iri].scheme)
-        ) {
-          const vocab = Object.keys(CacheSearchVocabularies).find(
-            (vocab) =>
-              CacheSearchVocabularies[vocab].glossary === elements[iri].scheme
-          );
-          if (vocab) {
-            WorkspaceVocabularies[vocab] = {
-              labels: CacheSearchVocabularies[vocab].labels,
-              readOnly: true,
-              namespace: CacheSearchVocabularies[vocab].namespace,
-              graph: vocab,
-              color: "#FFF",
-              count: createCount(),
-              glossary: CacheSearchVocabularies[vocab].glossary,
+      }),
+    processQuery(contextEndpoint, diagramContextQuery)
+      .then((response) => {
+        return response.json();
+      })
+      .then((data) => {
+        for (const result of data.results.bindings) {
+          const iri = result.iri.value;
+          if (!(iri in elements)) {
+            elements[iri] = {
+              active: result.active.value === "true",
+              diagramPosition: {},
+              hidden: {},
+              selectedName: initLanguageObject(""),
+              scheme: result.scheme.value,
             };
           }
+          if (!(result.diagramID.value in elements[iri].hidden)) {
+            elements[iri].diagramPosition[result.diagramID.value] = {
+              x: parseInt(result.posX.value),
+              y: parseInt(result.posY.value),
+            };
+            elements[iri].hidden[result.diagramID.value] =
+              result.hidden.value === "true";
+          }
         }
-        WorkspaceElements[iri] = {
-          hidden: elements[iri].hidden,
-          position: elements[iri].diagramPosition,
-          active: elements[iri].active,
-          selectedLabel: elements[iri].selectedName,
+        return true;
+      })
+      .catch((e) => {
+        console.error(e);
+        return false;
+      }),
+  ]);
+  if (booleans.some((b) => !b)) return false;
+  for (const iri in elements) {
+    if (
+      !Object.keys(WorkspaceVocabularies)
+        .map((vocab) => WorkspaceVocabularies[vocab].glossary)
+        .includes(elements[iri].scheme)
+    ) {
+      const vocab = Object.keys(CacheSearchVocabularies).find(
+        (vocab) =>
+          CacheSearchVocabularies[vocab].glossary === elements[iri].scheme
+      );
+      if (vocab) {
+        WorkspaceVocabularies[vocab] = {
+          labels: CacheSearchVocabularies[vocab].labels,
+          readOnly: true,
+          namespace: CacheSearchVocabularies[vocab].namespace,
+          graph: vocab,
+          color: "#FFF",
+          count: createCount(),
+          glossary: CacheSearchVocabularies[vocab].glossary,
         };
       }
     }
-    return true;
+    WorkspaceElements[iri] = {
+      hidden: elements[iri].hidden,
+      position: elements[iri].diagramPosition,
+      active: elements[iri].active,
+      selectedLabel: elements[iri].selectedName,
+    };
   }
+  return true;
 }
 
 export async function getSettings(contextEndpoint: string): Promise<{
@@ -267,6 +265,7 @@ export async function getSettings(contextEndpoint: string): Promise<{
   return ret;
 }
 
+//TODO: parallelize
 export async function getLinksConfig(
   contextEndpoint: string
 ): Promise<boolean> {
@@ -288,6 +287,30 @@ export async function getLinksConfig(
     "}} order by ?id",
   ].join(`
   `);
+  const diagramContextQuery = [
+    "PREFIX og: <http://onto.fel.cvut.cz/ontologies/application/ontoGrapher/>",
+    "select ?graph ?vertex ?diagram ?diagramID ?index ?posX ?posY ?id ?iri where {",
+    "graph <" + AppSettings.applicationContext + "> {",
+    "?link a og:link.",
+    "?link og:iri ?iri.",
+    "}",
+    "graph ?graph {",
+    "?link og:vertex ?vertex.",
+    "?link og:id ?id.",
+    "?vertex og:index ?index.",
+    "?vertex og:position-x ?posX.",
+    "?vertex og:position-y ?posY.",
+    "?diagram og:id ?diagramID.",
+    "?diagram og:representation ?representation.",
+    "}",
+    `?contextIRI <${parsePrefix(
+      "d-sgov-pracovní-prostor-pojem",
+      "odkazuje-na-přílohový-kontext"
+    )}> ?graph.`,
+    `values ?contextIRI {<${AppSettings.contextIRIs.join("> <")}>}`,
+    "}",
+  ].join(`
+    `);
   const links: {
     [key: string]: {
       iri: string;
@@ -303,72 +326,47 @@ export async function getLinksConfig(
       linkIRI: string;
     };
   } = {};
-  const appContextLinkRetrieval = await processQuery(contextEndpoint, query)
-    .then((response) => {
-      return response.json();
-    })
-    .then((data) => {
-      for (const result of data.results.bindings) {
-        if (
-          !Object.values(links).find(
-            (link) =>
-              link.active &&
-              link.iri === result.iri.value &&
-              link.sourceID === result.sourceID.value &&
-              link.targetID === result.targetID.value
-          )
-        ) {
-          links[result.id.value] = {
-            iri: result.iri.value,
-            targetID: result.targetID.value,
-            sourceID: result.sourceID.value,
-            active: result.active.value === "true",
-            vertices: {},
-            type:
-              result.type.value === "default"
-                ? LinkType.DEFAULT
-                : LinkType.GENERALIZATION,
-            sourceCardinality1: result.sourceCard1.value,
-            sourceCardinality2: result.sourceCard2.value,
-            targetCardinality1: result.targetCard1.value,
-            targetCardinality2: result.targetCard2.value,
-            linkIRI: result.link.value,
-          };
+  const booleans = await Promise.all([
+    processQuery(contextEndpoint, query)
+      .then((response) => {
+        return response.json();
+      })
+      .then((data) => {
+        for (const result of data.results.bindings) {
+          if (
+            !Object.values(links).find(
+              (link) =>
+                link.active &&
+                link.iri === result.iri.value &&
+                link.sourceID === result.sourceID.value &&
+                link.targetID === result.targetID.value
+            )
+          ) {
+            links[result.id.value] = {
+              iri: result.iri.value,
+              targetID: result.targetID.value,
+              sourceID: result.sourceID.value,
+              active: result.active.value === "true",
+              vertices: {},
+              type:
+                result.type.value === "default"
+                  ? LinkType.DEFAULT
+                  : LinkType.GENERALIZATION,
+              sourceCardinality1: result.sourceCard1.value,
+              sourceCardinality2: result.sourceCard2.value,
+              targetCardinality1: result.targetCard1.value,
+              targetCardinality2: result.targetCard2.value,
+              linkIRI: result.link.value,
+            };
+          }
         }
-      }
-      return true;
-    })
-    .catch((e) => {
-      console.error(e);
-      return false;
-    });
-  if (!appContextLinkRetrieval) return false;
-  else {
-    const diagramContextQuery = [
-      "PREFIX og: <http://onto.fel.cvut.cz/ontologies/application/ontoGrapher/>",
-      "select ?graph ?vertex ?diagram ?diagramID ?index ?posX ?posY ?id ?iri where {",
-      "graph <" + AppSettings.applicationContext + "> {",
-      "?link a og:link.",
-      "?link og:iri ?iri.",
-      "}",
-      "graph ?graph {",
-      "?link og:vertex ?vertex.",
-      "?link og:id ?id.",
-      "?vertex og:index ?index.",
-      "?vertex og:position-x ?posX.",
-      "?vertex og:position-y ?posY.",
-      "?diagram og:id ?diagramID.",
-      "?diagram og:representation ?representation.",
-      "}",
-      `?contextIRI <${parsePrefix(
-        "d-sgov-pracovní-prostor-pojem",
-        "odkazuje-na-přílohový-kontext"
-      )}> ?graph.`,
-      `values ?contextIRI {<${AppSettings.contextIRIs.join("> <")}>}`,
-      "}",
-    ].join(`
-    `);
-    return await processQuery(contextEndpoint, diagramContextQuery)
+        return true;
+      })
+      .catch((e) => {
+        console.error(e);
+        return false;
+      }),
+    processQuery(contextEndpoint, diagramContextQuery)
       .then((response) => {
         return response.json();
       })
@@ -385,38 +383,39 @@ export async function getLinksConfig(
             y: parseInt(result.posY.value),
           };
         }
-        for (const link in links) {
-          if (
-            !(links[link].sourceID in WorkspaceElements) ||
-            !(links[link].targetID in WorkspaceElements)
-          )
-            continue;
-          const sourceCard = new Cardinality("", "");
-          const targetCard = new Cardinality("", "");
-          sourceCard.setFirstCardinality(links[link].sourceCardinality1);
-          sourceCard.setSecondCardinality(links[link].sourceCardinality2);
-          targetCard.setFirstCardinality(links[link].targetCardinality1);
-          targetCard.setSecondCardinality(links[link].targetCardinality2);
-          WorkspaceLinks[link] = {
-            iri: links[link].iri,
-            source: links[link].sourceID,
-            target: links[link].targetID,
-            sourceCardinality: sourceCard,
-            targetCardinality: targetCard,
-            type: links[link].type,
-            vertices: links[link].vertices,
-            active: links[link].active,
-            hasInverse:
-              links[link].type !== LinkType.GENERALIZATION &&
-              links[link].iri in Links,
-            linkIRI: links[link].linkIRI,
-          };
-        }
-        return true;
       })
       .catch((e) => {
         console.error(e);
         return false;
-      });
+      }),
+  ]);
+  if (booleans.some((b) => !b)) return false;
+  for (const link in links) {
+    if (
+      !(links[link].sourceID in WorkspaceElements) ||
+      !(links[link].targetID in WorkspaceElements)
+    )
+      continue;
+    const sourceCard = new Cardinality("", "");
+    const targetCard = new Cardinality("", "");
+    sourceCard.setFirstCardinality(links[link].sourceCardinality1);
+    sourceCard.setSecondCardinality(links[link].sourceCardinality2);
+    targetCard.setFirstCardinality(links[link].targetCardinality1);
+    targetCard.setSecondCardinality(links[link].targetCardinality2);
+    WorkspaceLinks[link] = {
+      iri: links[link].iri,
+      source: links[link].sourceID,
+      target: links[link].targetID,
+      sourceCardinality: sourceCard,
+      targetCardinality: targetCard,
+      type: links[link].type,
+      vertices: links[link].vertices,
+      active: links[link].active,
+      hasInverse:
+        links[link].type !== LinkType.GENERALIZATION &&
+        links[link].iri in Links,
+      linkIRI: links[link].linkIRI,
+    };
   }
+  return true;
 }
diff --git a/src/queries/update/UpdateLinkQueries.ts b/src/queries/update/UpdateLinkQueries.ts
index c382c992..07e5ce75 100644
--- a/src/queries/update/UpdateLinkQueries.ts
+++ b/src/queries/update/UpdateLinkQueries.ts
@@ -159,65 +159,13 @@ export function updateProjectLink(del: boolean, ...ids: string[]): string {
     );
   }
   insert.push(
-    ...diagrams.map((diagram) =>
-      INSERT.DATA`${qb.g(diagram, insertBody)}`.build()
-    ),
+    INSERT.DATA`${qb.gs(diagrams, insertBody)}`.build(),
     INSERT.DATA`${qb.g(AppSettings.applicationContext, insertBody)}`.build()
   );
 
   return qb.combineQueries(...(del ? [deletes, ...insert] : [...insert]));
 }
 
-export function updateProjectLinkParallel(...ids: string[]): string[] {
-  const insertBody: string[] = [];
-  const insert: string[] = [];
-  const diagrams = Object.values(Diagrams)
-    .filter((diag) => diag.active)
-    .map((diagram) => diagram.graph);
-  if (ids.length === 0) return [];
-  for (const id of ids) {
-    checkLink(id);
-    const linkIRI = qb.i(WorkspaceLinks[id].linkIRI);
-
-    insertBody.push(
-      qb.s(linkIRI, "rdf:type", "og:link"),
-      qb.s(linkIRI, "og:id", qb.ll(id)),
-      qb.s(linkIRI, "og:iri", qb.i(WorkspaceLinks[id].iri)),
-      qb.s(linkIRI, "og:active", qb.ll(WorkspaceLinks[id].active)),
-      qb.s(linkIRI, "og:source", qb.i(WorkspaceLinks[id].source)),
-      qb.s(linkIRI, "og:target", qb.i(WorkspaceLinks[id].target)),
-      qb.s(linkIRI, "og:type", qb.ll(LinkConfig[WorkspaceLinks[id].type].id)),
-      qb.s(
-        linkIRI,
-        "og:sourceCardinality1",
-        qb.ll(WorkspaceLinks[id].sourceCardinality.getFirstCardinality())
-      ),
-      qb.s(
-        linkIRI,
-        "og:sourceCardinality2",
-        qb.ll(WorkspaceLinks[id].sourceCardinality.getSecondCardinality())
-      ),
-      qb.s(
-        linkIRI,
-        "og:targetCardinality1",
-        qb.ll(WorkspaceLinks[id].targetCardinality.getFirstCardinality())
-      ),
-      qb.s(
-        linkIRI,
-        "og:targetCardinality2",
-        qb.ll(WorkspaceLinks[id].targetCardinality.getSecondCardinality())
-      )
-    );
-  }
-  insert.push(
-    ...diagrams.map((diagram) =>
-      INSERT.DATA`${qb.g(diagram, insertBody)}`.build()
-    ),
-    INSERT.DATA`${qb.g(AppSettings.applicationContext, insertBody)}`.build()
-  );
-  return insert;
-}
-
 function checkLink(id: string) {
   if (!(id in WorkspaceLinks))
     throw new Error("Passed ID is not recognized as a relationship ID");