diff --git a/src/App.vue b/src/App.vue
index 918497c..fb31d2e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,8 +4,8 @@ import { RouterView, useRoute } from "vue-router";
 import { DataFactory } from "n3";
 import { useUiStore } from "@/stores/ui";
 import { useRdfStore } from "@/composables/rdfStore";
-import { useGetRequest } from "@/composables/api";
-import { sidenavConfigKey, apiBaseUrlConfigKey, type Profile } from "@/types";
+import { useApiRequest, useConcurrentApiRequests } from "@/composables/api";
+import { sidenavConfigKey, type Profile } from "@/types";
 import MainNav from "@/components/navs/MainNav.vue";
 import Breadcrumbs from "@/components/Breadcrumbs.vue";
 import RightSideBar from "@/components/navs/RightSideBar.vue";
@@ -18,111 +18,121 @@ const { namedNode } = DataFactory;
 const version = packageJson.version;
 
 const sidenav = inject(sidenavConfigKey) as boolean;
-const apiBaseUrl = inject(apiBaseUrlConfigKey) as string;
 const route = useRoute();
 const ui = useUiStore();
-
-const { data, profiles, loading, error, doRequest } = useGetRequest();
-const { data: profData, profiles: profProfiles, loading: profLoading, error: profError, doRequest: profDoRequest } = useGetRequest();
-const { store, prefixes, parseIntoStore, qnameToIri } = useRdfStore();
-const { store: profStore, prefixes: profPrefixes, parseIntoStore: profParseIntoStore, qnameToIri: profQnameToIri } = useRdfStore();
-const { store: combinedStore, prefixes: combinedPrefixes, parseIntoStore: combinedParseIntoStore, qnameToIri: combinedQnameToIri } = useRdfStore();
+const { loading: rootLoading, error: rootError, apiGetRequest: rootApiGetRequest } = useApiRequest(); // main request to API root
+const { loading: profLoading, error: profError, apiGetRequest: profApiGetRequest } = useApiRequest(); // profiles request
+const { loading: concurrentLoading, hasError: concurrentHasError, concurrentApiRequests } = useConcurrentApiRequests(); // concurrent profile requests
+const { store: rootStore, parseIntoStore: rootParseIntoStore, qnameToIri: rootQnameToIri } = useRdfStore(); // store for API root data
+const { store: profStore, parseIntoStore: profParseIntoStore, qnameToIri: profQnameToIri } = useRdfStore(); // profiles store
 
 document.title = ui.pageTitle;
 
-onMounted(() => {
+async function getRootApiMetadata() {
+    // get API details
+    const { data: rootData } = await rootApiGetRequest("/");
+    if (rootData && !rootError.value) {
+        rootParseIntoStore(rootData);
+
+        // get API version
+        const version = rootStore.value.getObjects(null, rootQnameToIri("prez:version"), null)[0];
+        ui.apiVersion = version.value;
+
+        // get search methods per flavour
+        let searchMethods: {[key: string]: string[]} = {};
+        rootStore.value.forObjects(object => {
+            let flavour = "";
+            let methods: string[] = [];
+            rootStore.value.forEach(q => {
+                if (q.predicate.value === rootQnameToIri("a")) {
+                    flavour = q.object.value.split(`${rootQnameToIri("prez:")}`)[1];
+                } else if (q.predicate.value === rootQnameToIri("prez:availableSearchMethod")) {
+                    methods.push(q.object.value.split(`${rootQnameToIri("prez:")}`)[1]);
+                }
+            }, object, null, null, null);
+            searchMethods[flavour] = methods;
+        }, null, rootQnameToIri("prez:enabledPrezFlavour"), null);
+        ui.searchMethods = searchMethods;
+    }
+}
+
+async function getProfiles() {
     // if profiles don't exist in pinia
     if (Object.keys(ui.profiles).length === 0) {
-        profDoRequest(`${apiBaseUrl}/profiles`, () => {
-            profParseIntoStore(profData.value);
+        const { data: profData } = await profApiGetRequest("/profiles");
+        if (profData && !profError.value) {
+            profParseIntoStore(profData);
 
             // get list of profiles
             let profileUris: {[uri: string]: {
                 token: string;
                 link: string;
             }} = {};
+
             profStore.value.forSubjects(subject => {
                 profStore.value.forEach(q => {
                     profileUris[q.subject.value] = {
                         token: q.object.value.replace("/profiles/", ""),
-                        link: `${apiBaseUrl}${q.object.value}`
+                        link: q.object.value
                     }
                 }, subject, namedNode(profQnameToIri("prez:link")), null, null);
             }, namedNode(profQnameToIri("a")), namedNode(profQnameToIri("prof:Profile")), null);
-            
-            // promise.all request for each profile in parallel
-            Promise.all(Object.values(profileUris).map(p => fetch(p.link).then(r => r.text()))).then(values => {
-                // parse all results into store
-                values.forEach(value => {
-                    combinedParseIntoStore(value)
-                });
-
-                let profs: Profile[] = [];
-
-                combinedStore.value.forSubjects(subject => {
-                    let p: Profile = {
-                        namespace: subject.id,
-                        token: profileUris[subject.id].token,
-                        title: "",
-                        description: "",
-                        mediatypes: [],
-                        defaultMediatype: "",
-                        labelPredicates: [],
-                        descriptionPredicates: [],
-                        explanationPredicates: []
-                    };
-                    combinedStore.value.forEach(q => {
-                        if (q.predicate.value === combinedQnameToIri("dcterms:title")) {
-                            p.title = q.object.value;
-                        } else if (q.predicate.value === combinedQnameToIri("dcterms:description")) {
-                            p.description = q.object.value;
-                        // } else if (q.predicate.value === combinedQnameToIri("dcterms:identifier")) {
-                        //     p.token = q.object.value;
-                        } else if (q.predicate.value === combinedQnameToIri("altr-ext:hasResourceFormat")) {
-                            p.mediatypes.push(q.object.value);
-                        } else if (q.predicate.value === combinedQnameToIri("altr-ext:hasDefaultResourceFormat")) {
-                            p.defaultMediatype = q.object.value;
-                        } else if (q.predicate.value === combinedQnameToIri("altr-ext:hasLabelPredicate")) {
-                            p.labelPredicates.push(q.object.value);
-                        } else if (q.predicate.value === combinedQnameToIri("altr-ext:hasDescriptionPredicate")) {
-                            p.descriptionPredicates.push(q.object.value);
-                        } else if (q.predicate.value === combinedQnameToIri("altr-ext:hasExplanationPredicate")) {
-                            p.explanationPredicates.push(q.object.value);
-                        }
-                    }, subject, null, null, null);
-                    p.mediatypes.sort((a, b) => Number(b === p.defaultMediatype) - Number(a === p.defaultMediatype));
-                    profs.push(p);
-                }, namedNode(combinedQnameToIri("a")), namedNode(combinedQnameToIri("prof:Profile")), null);
-
-                ui.profiles = profs.reduce<{[namespace: string]: Profile}>((obj, prof) => (obj[prof.namespace] = prof, obj), {}); // {uri: {...}, ...}
-            });
-        });
-    }
 
-    // get API details
-    doRequest(apiBaseUrl, () => {
-        parseIntoStore(data.value);
 
-        // get API version
-        const version = store.value.getObjects(null, qnameToIri("prez:version"), null)[0];
-        ui.apiVersion = version.value;
+            // request each profile in parallel
+            const profilesData = await concurrentApiRequests(Object.values(profileUris).map(p => p.link));
 
-        // get search methods per flavour
-        let searchMethods: {[key: string]: string[]} = {};
-        store.value.forObjects(object => {
-            let flavour = "";
-            let methods: string[] = [];
-            store.value.forEach(q => {
-                if (q.predicate.value === qnameToIri("a")) {
-                    flavour = q.object.value.split(`${qnameToIri('prez:')}`)[1];
-                } else if (q.predicate.value === qnameToIri("prez:availableSearchMethod")) {
-                    methods.push(q.object.value.split(`${qnameToIri('prez:')}`)[1]);
+            profilesData.forEach(r => {
+                if (r.value) {
+                    profParseIntoStore(r.value);
                 }
-            }, object, null, null, null);
-            searchMethods[flavour] = methods;
-        }, null, qnameToIri("prez:enabledPrezFlavour"), null);
-        ui.searchMethods = searchMethods;
-    });
+            });
+
+            let profs: Profile[] = [];
+
+            profStore.value.forSubjects(subject => {
+                let p: Profile = {
+                    namespace: subject.id,
+                    token: profileUris[subject.id].token,
+                    title: "",
+                    description: "",
+                    mediatypes: [],
+                    defaultMediatype: "",
+                    labelPredicates: [],
+                    descriptionPredicates: [],
+                    explanationPredicates: []
+                };
+                
+                profStore.value.forEach(q => {
+                    if (q.predicate.value === profQnameToIri("dcterms:title")) { // need to use label predicate from profile
+                        p.title = q.object.value;
+                    } else if (q.predicate.value === profQnameToIri("dcterms:description")) { // need to use description predicate from profile
+                        p.description = q.object.value;
+                    // } else if (q.predicate.value === profQnameToIri("dcterms:identifier")) {
+                    //     p.token = q.object.value;
+                    } else if (q.predicate.value === profQnameToIri("altr-ext:hasResourceFormat")) {
+                        p.mediatypes.push(q.object.value);
+                    } else if (q.predicate.value === profQnameToIri("altr-ext:hasDefaultResourceFormat")) {
+                        p.defaultMediatype = q.object.value;
+                    } else if (q.predicate.value === profQnameToIri("altr-ext:hasLabelPredicate")) {
+                        p.labelPredicates.push(q.object.value);
+                    } else if (q.predicate.value === profQnameToIri("altr-ext:hasDescriptionPredicate")) {
+                        p.descriptionPredicates.push(q.object.value);
+                    } else if (q.predicate.value === profQnameToIri("altr-ext:hasExplanationPredicate")) {
+                        p.explanationPredicates.push(q.object.value);
+                    }
+                }, subject, null, null, null);
+                p.mediatypes.sort((a, b) => Number(b === p.defaultMediatype) - Number(a === p.defaultMediatype));
+                profs.push(p);
+            }, namedNode(profQnameToIri("a")), namedNode(profQnameToIri("prof:Profile")), null);
+
+            ui.profiles = profs.reduce<{[namespace: string]: Profile}>((obj, prof) => (obj[prof.namespace] = prof, obj), {}); // {uri: {...}, ...}
+        }
+    }
+}
+
+onMounted(async () => {
+    await Promise.all([getRootApiMetadata(), getProfiles()]);
 });
 </script>
 
diff --git a/src/components/MapClient.d.ts b/src/components/MapClient.d.ts
index 45b76fc..32e90aa 100644
--- a/src/components/MapClient.d.ts
+++ b/src/components/MapClient.d.ts
@@ -19,3 +19,13 @@ export enum ShapeTypes {
 }
 
 export type DrawingModes = 'MARKER' | 'RECTANGLE' | 'POLYGON'
+
+/** well known text simplified result object, as returned by mapSearch */
+export type WKTResult = {
+    uri: string
+    link: string
+    wkt: string
+    fcLabel: string
+    label: string
+    id?: string
+}
diff --git a/src/components/MapClient.vue b/src/components/MapClient.vue
index 9165f3e..53b1e40 100644
--- a/src/components/MapClient.vue
+++ b/src/components/MapClient.vue
@@ -6,7 +6,7 @@ import { wktToGeoJSON } from "@terraformer/wkt"
 import { mapConfigKey, type MapConfig } from "@/types";
 import { convertConfigTypes } from '@/util/mapSearchHelper'
 import type { MapOptionsCenter } from '@/types'
-import type { WKTResult } from '@/stores/mapSearchStore.d';
+import type { WKTResult } from "@/components/MapClient.d";
 import { ShapeTypes, type DrawingModes } from "@/components/MapClient.d";
 
 
diff --git a/src/components/ProfilesTable.vue b/src/components/ProfilesTable.vue
index e90d929..4d4277d 100644
--- a/src/components/ProfilesTable.vue
+++ b/src/components/ProfilesTable.vue
@@ -1,7 +1,6 @@
 <script lang="ts" setup>
 import { computed } from "vue";
 import { useUiStore } from "@/stores/ui";
-import type { ProfileHeader } from "@/types";
 
 const mediatypeNames: {[key: string]: string} = {
     "text/html": "HTML",
@@ -13,15 +12,10 @@ const mediatypeNames: {[key: string]: string} = {
     "application/geo+json": "GeoJSON"
 };
 
-const props = defineProps<{
-    profiles: ProfileHeader[];
-    path: string;
-}>();
-
 const ui = useUiStore();
 
 const defaultToken = computed(() => {
-    const defaultProfile = props.profiles.find(p => p.default);
+    const defaultProfile = ui.rightNavConfig.profiles!.find(p => p.default);
     if (defaultProfile === undefined) {
         throw new TypeError("A default profile must exist.");
     }
@@ -29,7 +23,7 @@ const defaultToken = computed(() => {
 });
 
 const orderedProfiles = computed(() => {
-    const includedProfiles = props.profiles.map(prof => prof.token);
+    const includedProfiles = ui.rightNavConfig.profiles!.map(prof => prof.token);
     return Object.values(ui.profiles)
         .filter(prof => includedProfiles.includes(prof.token))
         .sort((a, b) => Number(b.token === defaultToken.value) - Number(a.token === defaultToken.value))
@@ -49,7 +43,7 @@ const orderedProfiles = computed(() => {
         </tr>
         <tr v-for="profile in orderedProfiles">
             <td>
-                <RouterLink :to="`${props.path}?_profile=${profile.token}`" title="Get profile representation">
+                <RouterLink :to="`${ui.rightNavConfig.currentUrl}?_profile=${profile.token}`" title="Get profile representation">
                     {{ profile.token }}
                 </RouterLink>
                 <span v-if="(profile.token === defaultToken)" class="badge" title="This is the default profile for this endpoint">default</span>
@@ -57,7 +51,7 @@ const orderedProfiles = computed(() => {
             <td><RouterLink :to="`/profiles/${profile.token}`" title="Go to profile page">{{ profile.title }}</RouterLink></td>
             <td>
                 <div v-for="mediatype in profile.mediatypes">
-                    <RouterLink :to="`${props.path}?_profile=${profile.token}&_mediatype=${mediatype}`">
+                    <RouterLink :to="`${ui.rightNavConfig.currentUrl}?_profile=${profile.token}&_mediatype=${mediatype}`">
                         {{ mediatypeNames[mediatype] || mediatype }}
                     </RouterLink>
                     <span v-if="(mediatype === profile.defaultMediatype)" class="badge" title="This is the default format for this profile">default</span>
diff --git a/src/components/search/CatPrezSearch.vue b/src/components/search/CatPrezSearch.vue
index 384e8ed..095e87a 100644
--- a/src/components/search/CatPrezSearch.vue
+++ b/src/components/search/CatPrezSearch.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup>
-import { ref, onMounted, inject, watch } from "vue";
+import { ref, onMounted, watch } from "vue";
 import { DataFactory } from "n3";
-import { apiBaseUrlConfigKey } from "@/types";
-import { useGetRequest } from "@/composables/api";
+import { useApiRequest } from "@/composables/api";
 import { useRdfStore } from "@/composables/rdfStore";
 
 const { namedNode } = DataFactory;
 
-const apiBaseUrl = inject(apiBaseUrlConfigKey) as string;
-const { data, loading, error, doRequest } = useGetRequest();
+const { loading, error, apiGetRequest } = useApiRequest();
 const { store, parseIntoStore, qnameToIri } = useRdfStore();
 
 const props = defineProps<{
@@ -34,9 +32,10 @@ watch(() => props.defaultSelected, (newValue, oldValue) => {
     }
 });
 
-onMounted(() => {
-    doRequest(`${apiBaseUrl}/c/catalogs`, () => {
-        parseIntoStore(data.value);
+onMounted(async () => {
+    const { data } = await apiGetRequest("/c/catalogs");
+    if (data && !error.value) {
+        parseIntoStore(data);
 
         store.value.forSubjects(member => {
             let option: CatalogOption = {
@@ -50,7 +49,7 @@ onMounted(() => {
             }, member, null, null, null);
             options.value.push(option);
         }, namedNode(qnameToIri("a")), namedNode(qnameToIri("dcat:Catalog")), null);
-    });
+    }
 });
 </script>
 
diff --git a/src/components/search/CatPrezSearchMap.vue b/src/components/search/CatPrezSearchMap.vue
index f4d8225..fcf14d1 100644
--- a/src/components/search/CatPrezSearchMap.vue
+++ b/src/components/search/CatPrezSearchMap.vue
@@ -1,127 +1,221 @@
 <script lang="ts" setup>
-import { onMounted, ref, computed } from "vue";
-
-// the searchable map component and related map type definitions
-import MapClient from "@/components/MapClient.vue";
-import { AreaTypes, ShapeTypes, type Coords } from "@/components/MapClient.d";
-
-// the pinia search store and related type definitions to manage the returned catalog tree
-import { refDataStore } from "@/stores/refDataStore";
-import { QUERY_GET_CATALOGS, QUERY_GET_THEMES, QUERY_SEARCH } from "@/stores/catalogQueries"
-import type { RDCatalog, RDSearch, RDTheme } from "@/stores/catalogQueries.d"
+import { onMounted, ref, computed, inject, watch } from "vue";
+import { DataFactory } from "n3";
+import { apiBaseUrlConfigKey } from "@/types";
+import { ShapeTypes, type Coords } from "@/components/MapClient.d";
+import { useUiStore } from "@/stores/ui";
+import { useApiRequest, useSparqlRequest } from "@/composables/api";
+import { useRdfStore } from "@/composables/rdfStore";
+import { catalogSpatialSearch, getThemesQuery } from "@/sparqlQueries/catalogSearch";
 import { shapeQueryPart } from "@/util/mapSearchHelper"
-
-import { copyToClipboard } from "@/util/helpers";
-
+import { copyToClipboard, sortByTitle } from "@/util/helpers";
+import MapClient from "@/components/MapClient.vue";
 import LoadingMessage from "@/components/LoadingMessage.vue";
 import ErrorMessage from "@/components/ErrorMessage.vue";
 import BaseModal from "@/components/BaseModal.vue";
 
-const MAX_DESC_LENGTH = 200;
+const { namedNode } = DataFactory;
 
-const rdCatalogs = refDataStore("catalogs")()
-const rdThemes = refDataStore("themes")()
-const rdSearch = refDataStore("search")()
+type Option = {
+    title?: string;
+    iri: string;
+};
 
-const searchTermRef = ref("")
-const selectedCatalogsRef = ref<string[]>([])
-const selectedThemesRef = ref<string[]>([])
-const shapeTypeRef = ref(ShapeTypes.None)
-const coordsRef = ref<Coords>([])
-const showQueryRef = ref(false)
-const sparqlQueryRef = ref("")
-const limitRef = ref(10)
+type SparqlBinding = {
+    [key: string]: {
+        type: string;
+        datatype?: string;
+        value: string;
+        "xml:lang"?: string;
+    }
+};
+
+// type SparqlSelectResponse = {
+//     head: {
+//         vars: string[];
+//     };
+//     results: {
+//         bindings: SparqlBinding[];
+//     };
+// };
+
+const apiBaseUrl = inject(apiBaseUrlConfigKey) as string;
+
+const ui = useUiStore();
+const { loading: catalogLoading, error: catalogError, apiGetRequest: catalogApiGetRequest } = useApiRequest();
+const { loading: themesLoading, error: themesError, sparqlGetRequest: themesSparqlGetRequest } = useSparqlRequest();
+const { loading: searchLoading, error: searchError, sparqlGetRequest: searchSparqlGetRequest } = useSparqlRequest();
+const { store, parseIntoStore, qnameToIri } = useRdfStore();
+
+const LIVE_SEARCH = true;
+const DEFAULT_LABEL_PREDICATES = [qnameToIri("dcterms:title")];
+const MAX_DESC_LENGTH = 200;
 
-const modal = ref<string | null>(null);
+const catalogs = ref<Option[]>([]);
+const themes = ref<Option[]>([]);
+const selectedCatalogs = ref<string[]>([]);
+const selectedThemes = ref<string[]>([]);
+const searchTerm = ref("");
+const limit = ref(10);
+const shape = ref<{
+    type: ShapeTypes;
+    coords: Coords;
+}>({
+    type: ShapeTypes.None,
+    coords: []
+});
+const showQuery = ref(false);
+const results = ref<{
+    iri: string;
+    title: string;
+    description: string;
+    themes: {
+        iri: string;
+        title: string;
+    }[];
+}[]>([]);
+
+const query = computed(() => {
+    return catalogSpatialSearch(
+        selectedCatalogs.value,
+        searchTerm.value,
+        selectedThemes.value,
+        shapeQueryPart(shape.value.coords),
+        limit.value > 0 ? parseInt(limit.value.toString()) : 0
+    );
+});
 
 const allCatalogsSelected = computed(() => {
-    let allSelected = true;
-    (rdCatalogs.data as RDCatalog[]).forEach(catalog => {
-        if (!selectedCatalogsRef.value.includes(catalog.c)) {
-            allSelected = false;
-            return false;
-        }
-    });
-    return allSelected;
+    return catalogs.value.every(catalog => selectedCatalogs.value.includes(catalog.iri));
 });
 
 const allThemesSelected = computed(() => {
-    let allSelected = true;
-    (rdThemes.data as RDTheme[]).forEach(theme => {
-        if (!selectedThemesRef.value.includes(theme.th)) {
-            allSelected = false;
-            return false;
-        }
-    });
-    return allSelected;
+    return themes.value.every(theme => selectedThemes.value.includes(theme.iri));
 });
 
-async function toggleSelectAllCatalogs() {
-    let selectedCatalogs: string[] = [];
-    if (!allCatalogsSelected.value) {
-        (rdCatalogs.data as RDCatalog[]).forEach(catalog => {
-            selectedCatalogs.push(catalog.c);
-        });
-    }
-    selectedCatalogsRef.value = selectedCatalogs;
+function toggleSelectAllCatalogs() {
+    selectedCatalogs.value = !allCatalogsSelected.value ? catalogs.value.map(catalog => catalog.iri) : [];
+}
 
-    await performSearch();
+function toggleSelectAllThemes() {
+    selectedThemes.value = !allThemesSelected.value ? themes.value.map(theme => theme.iri) : [];
 }
 
-async function toggleSelectAllThemes() {
-    let selectedThemes: string[] = [];
-    if (!allThemesSelected.value) {
-        (rdThemes.data as RDTheme[]).forEach(theme => {
-            selectedThemes.push(theme.th);
-        });
+function handleMapSelectionChange(selectedCoords: Coords, shapeType: ShapeTypes) {
+    shape.value = {
+        type: shapeType,
+        coords: selectedCoords
+    };
+}
+
+/**
+ * Gets the list of Catalogs from the API endpoint `/c/catalogs` & creates the list of catalog options
+ */
+async function getCatalogs() {
+    const { data: catalogData, profiles: catalogProfiles } = await catalogApiGetRequest("/c/catalogs");
+    if (catalogData && catalogProfiles.length > 0 && !catalogError.value) {
+        const defaultProfile = ui.profiles[catalogProfiles.find(p => p.default)!.uri];
+        const labelPredicates = defaultProfile.labelPredicates.length > 0 ? defaultProfile.labelPredicates : DEFAULT_LABEL_PREDICATES;
+
+        parseIntoStore(catalogData);
+
+        const catalogOptions: Option[] = [];
+
+        store.value.forSubjects(subject => {
+            if (!subject.value.endsWith("/system/catprez")) { // hide system catalog
+                const catalog: Option = {
+                    iri: subject.value
+                };
+
+                store.value.forEach(q => {
+                    if (labelPredicates.includes(q.predicate.value)) {
+                        catalog.title = q.object.value;
+                    }
+                }, subject, null, null, null);
+
+                catalogOptions.push(catalog);
+            }
+        }, namedNode(qnameToIri("a")), namedNode(qnameToIri("dcat:Catalog")), null);
+
+        catalogs.value = catalogOptions.sort(sortByTitle);
     }
-    selectedThemesRef.value = selectedThemes;
+}
 
-    await performSearch();
+/**
+ * Gets a list of themes from a SPARQL query from the API & creates the list of theme options
+ */
+async function getThemes() {
+    const themesData = await themesSparqlGetRequest(`${apiBaseUrl}/sparql`, getThemesQuery(selectedCatalogs.value));
+    if (themesData && !themesError.value) {
+        themes.value = (themesData.results.bindings as SparqlBinding[]).map(result => {
+            return {
+                title: result.title.value,
+                iri: result.theme.value
+            };
+        });
+    }
 }
 
-// called when a selection has changed
-const updateSelection = async (selectedCoords:Coords, shapeType:ShapeTypes) => {
-    //shapeTypeRef.value = selectedCoords.length == 0 ? ShapeTypes.None : (selectedCoords.length == 1 ? ShapeTypes.Point : ShapeTypes.Polygon)
-    shapeTypeRef.value = shapeType
-    coordsRef.value = selectedCoords
-    await performSearch();
+/**
+ * Performs search via a SPARQL query
+ */
+async function doSearch() {
+    const searchData = await searchSparqlGetRequest(`${apiBaseUrl}/sparql`, query.value);
+    if (searchData && !searchError.value) {
+        results.value = (searchData.results.bindings as SparqlBinding[]).map(result => {
+            return {
+                iri: result.resource.value,
+                title: result.title.value,
+                description: result.desc.value,
+                themes: result.themeList.value.split("\t").map((theme, index) => {
+                    return {
+                        iri: theme,
+                        title: result.themeListLabels.value.split("\t")[index]
+                    };
+                })
+            }
+        });
+    }
 }
 
-const links = [
-    {
-        label: "Catalogs",
-        url: "/c/catalogs",
-        description: "A list of DCAT Catalogs"
+watch(selectedCatalogs, async (newValue, oldValue) => {
+    await getThemes();
+    if (LIVE_SEARCH) {
+        await doSearch();
     }
-];
+}, { deep: true });
 
-const fetchThemes = async () => {
-    await rdThemes.fetch<RDTheme[]>(QUERY_GET_THEMES(selectedCatalogsRef.value));
-}
+watch(selectedThemes, async (newValue, oldValue) => {
+    if (LIVE_SEARCH) {
+        await doSearch();
+    }
+}, { deep: true });
 
-const performSearch = async(event: Event|null=null) => {
-    if(event) {
-        event.preventDefault();
+watch(limit, async (newValue, oldValue) => {
+    if (LIVE_SEARCH) {
+        await doSearch();
     }
-    sparqlQueryRef.value = QUERY_SEARCH(selectedCatalogsRef.value, searchTermRef.value, selectedThemesRef.value, shapeQueryPart(coordsRef.value), //limitRef.value);
-        (limitRef.value > 0 ? parseInt(limitRef.value.toString()) + 1 : 0));
-    await rdSearch.fetch<RDSearch[]>(sparqlQueryRef.value)
-}
+});
 
-// start off by loading the main filter lists for catalogs and themes
-onMounted(async ()=>{
-    await rdCatalogs.fetch<RDCatalog[]>(QUERY_GET_CATALOGS);
-    (rdCatalogs.data as RDCatalog[]).forEach(cat=>{
-        selectedCatalogsRef.value.push(cat.c)
-    });
-    await fetchThemes();
-    (rdThemes.data as RDTheme[]).forEach(theme=>{
-        selectedThemesRef.value.push(theme.th);
-    })
-    await performSearch();
-})
+watch(searchTerm, async (newValue, oldValue) => {
+    if (LIVE_SEARCH) {
+        await doSearch();
+    }
+});
 
+watch(shape, async (newValue, oldValue) => {
+    if (LIVE_SEARCH) {
+        await doSearch();
+    }
+}, { deep: true });
+
+onMounted(async () => {
+    await getCatalogs();
+    selectedCatalogs.value = catalogs.value.map(catalog => catalog.iri); // select all by default
+    await getThemes();
+    selectedThemes.value = themes.value.map(theme => theme.iri); // select all by default
+    // await doSearch();
+});
 </script>
 
 <template>
@@ -135,25 +229,36 @@ onMounted(async ()=>{
                             type="search"
                             name="term"
                             class="search-input"
-                            v-model="searchTermRef"
+                            v-model="searchTerm"
                             placeholder="Search..."
-                            @keyup.enter="performSearch()"
+                            @keyup.enter="doSearch()"
                         >
                     </div>
                     <div class="form-section">
                         <h4>Catalogues</h4>
                         <div class="catalog-buttons">
                             <div class="select-all-input">
-                                <input type="checkbox" name="select-all-catalogs" id="select-all-catalogs" @change="toggleSelectAllCatalogs" v-model="allCatalogsSelected">
+                                <input
+                                    type="checkbox"
+                                    name="select-all-catalogs"
+                                    id="select-all-catalogs"
+                                    @change="toggleSelectAllCatalogs"
+                                    :checked="allCatalogsSelected"
+                                >
                                 <label for="select-all-catalogs">Select all</label>
                             </div>
                         </div>
-                        <LoadingMessage v-if="rdCatalogs.loading" />
-                        <ErrorMessage v-else-if="rdCatalogs.error" :message="`Unable to load catalogs: ${rdCatalogs.error}`" />
-                        <ul v-else-if="rdCatalogs.data.length > 0" class="catalog-options">
-                            <li v-for="(catalog, index) in <RDCatalog[]>rdCatalogs.data" class="catalog-option" :style="catalog.c.endsWith('/system/catprez') ? 'display: none;' : ''">
-                                <input type="checkbox" :id="`catalog-${index}`" :value="catalog.c" v-model="selectedCatalogsRef" @change="async (event) => { await fetchThemes(); await performSearch(); }" />
-                                <label :for="`catalog-${index}`">{{ catalog.t }}</label>
+                        <LoadingMessage v-if="catalogLoading" />
+                        <ErrorMessage v-else-if="catalogError" :message="`Unable to load catalogs: ${catalogError}`" />
+                        <ul v-else-if="catalogs.length > 0" class="catalog-options">
+                            <li v-for="(catalog, index) in catalogs" class="catalog-option">
+                                <input
+                                    type="checkbox"
+                                    :id="`catalog-${index}`"
+                                    :value="catalog.iri"
+                                    v-model="selectedCatalogs"
+                                />
+                                <label :for="`catalog-${index}`">{{ catalog.title }}</label>
                             </li>
                         </ul>
                     </div>
@@ -161,49 +266,54 @@ onMounted(async ()=>{
                         <h4>Themes</h4>
                         <div class="theme-buttons">
                             <div class="select-all-input">
-                                <input type="checkbox" name="select-all-themes" id="select-all-themes" @change="toggleSelectAllThemes" v-model="allThemesSelected">
+                                <input
+                                    type="checkbox"
+                                    name="select-all-themes"
+                                    id="select-all-themes"
+                                    @change="toggleSelectAllThemes"
+                                    :checked="allThemesSelected"
+                                >
                                 <label for="select-all-themes">Select all</label>
                             </div>
                         </div>
-                        <LoadingMessage v-if="rdThemes.loading" />
-                        <ErrorMessage v-else-if="rdThemes.error" :message="`Unable to load catalogs: ${rdThemes.error}`" />
-                        <ul v-else-if="rdThemes.data.length > 0" class="theme-options">
-                            <li v-for="(theme, index) in <RDTheme[]>rdThemes.data" class="theme-option" :key="theme.th">
-                                <input type="checkbox" 
-                                    :value="theme.th" 
-                                    v-model="selectedThemesRef"
+                        <LoadingMessage v-if="themesLoading" />
+                        <ErrorMessage v-else-if="themesError" :message="`Unable to load catalogs: ${themesError}`" />
+                        <ul v-else-if="themes.length > 0" class="theme-options">
+                            <li v-for="(theme, index) in themes" class="theme-option">
+                                <input
+                                    type="checkbox" 
+                                    :value="theme.iri" 
+                                    v-model="selectedThemes"
                                     :id="`theme-${index}`"
-                                    @change="(event) => performSearch()"
                                 />
-                                <label :for="`theme-${index}`">{{ theme.pl }}</label>
+                                <label :for="`theme-${index}`">{{ theme.title }}</label>
                             </li>
                         </ul>
                     </div>
                 </div>
                 <div class="bottom-buttons">
-                    <button class="btn outline" @click="modal = 'sparqlQuery'">Show Query <i class="fa-regular fa-code"></i></button>
+                    <button class="btn outline" @click="showQuery = true">Show Query <i class="fa-regular fa-code"></i></button>
                     <div class="right-buttons">
                         <div class="result-limit-input">
                             <label for="result-limit">Result limit</label>
-                            <input id="result-limit" type="number" @change="performSearch()" v-model="limitRef" min="1" max="100">
+                            <input id="result-limit" type="number" v-model="limit" min="1" max="100">
                         </div>
-                        <button class="btn" @click="performSearch()">Search <i class="fa-regular fa-magnifying-glass"></i></button>
+                        <button class="btn" @click="doSearch()">Search <i class="fa-regular fa-magnifying-glass"></i></button>
                     </div>
                 </div>
             </div>
             <div class="search-map">
                 <MapClient
-                    ref="searchMapRef"
                     :drawing-modes="['RECTANGLE']"
-                    @selectionUpdated="updateSelection"
+                    @selectionUpdated="handleMapSelectionChange"
                 />
             </div>
         </div>
         <div class="results">
             <h3>Results</h3>
-            <LoadingMessage v-if="rdSearch.loading" />
-            <ErrorMessage v-else-if="rdSearch.error" :message="rdSearch.error" />
-            <table v-else-if="rdSearch.data && rdSearch.data.length > 0">
+            <LoadingMessage v-if="searchLoading" />
+            <ErrorMessage v-else-if="searchError" :message="searchError" />
+            <table v-else-if="results.length > 0">
                 <thead>
                     <tr>
                         <th>Title</th>
@@ -211,20 +321,20 @@ onMounted(async ()=>{
                     </tr>
                 </thead>
                 <tbody>
-                    <template v-for="(result, index) in <RDSearch[]>rdSearch.data">
+                    <template v-for="(result, index) in results">
                         <tr :class="`${index % 2 === 1 ? 'grey' : '' }`">
-                            <td><a :href="`/object?uri=${encodeURIComponent(result.r)}`">{{ result.t }}</a></td>
+                            <td><a :href="`/object?uri=${encodeURIComponent(result.iri)}`">{{ result.title }}</a></td>
                             <td>
-                                <template v-for="(th, tindex) in result.thlist.split('\t')">
-                                    <a :href="`/object?uri=${th}`">
-                                        {{ result.thpllist.split('\t')[tindex] }}
+                                <template v-for="theme in result.themes">
+                                    <a :href="`/object?uri=${theme.iri}`">
+                                        {{ theme.title }}
                                     </a>
                                     <br/>
                                 </template>
                             </td>
                         </tr>
-                        <tr v-if="result.d" :class="`${index % 2 === 1 ? 'grey' : '' }`">
-                            <td colspan="2" class="desc">{{ result.d.length > MAX_DESC_LENGTH ? result.d.slice(0, MAX_DESC_LENGTH) + '...' : result.d }}</td>
+                        <tr v-if="result.description" :class="`${index % 2 === 1 ? 'grey' : '' }`">
+                            <td colspan="2" class="desc">{{ result.description.length > MAX_DESC_LENGTH ? result.description.slice(0, MAX_DESC_LENGTH) + '...' : result.description }}</td>
                         </tr>
                     </template>
                 </tbody>
@@ -234,13 +344,13 @@ onMounted(async ()=>{
             </div>
         </div>
     </div>
-    <BaseModal v-if="modal === 'sparqlQuery'" @modalClosed="modal = null">
+    <BaseModal v-if="showQuery" @modalClosed="showQuery = false">
         <template #headerMiddle>Spatial Search SPARQL Query</template>
         <div class="sparql-query-content">
-            <pre>{{ sparqlQueryRef.trim() }}</pre>
+            <pre>{{ query.trim() }}</pre>
         </div>
         <template #footer>
-            <button class="btn outline sparql-copy-btn" @click="copyToClipboard(sparqlQueryRef)" title="Copy SPARQL query">Copy <i class="fa-regular fa-copy"></i></button>
+            <button class="btn outline sparql-copy-btn" @click="copyToClipboard(query)" title="Copy SPARQL query">Copy <i class="fa-regular fa-copy"></i></button>
         </template>
     </BaseModal>
 </template>
diff --git a/src/components/search/SpacePrezSearch.vue b/src/components/search/SpacePrezSearch.vue
index 209b533..8965036 100644
--- a/src/components/search/SpacePrezSearch.vue
+++ b/src/components/search/SpacePrezSearch.vue
@@ -1,16 +1,19 @@
 <script lang="ts" setup>
-import { ref, onMounted, inject, watch } from "vue";
+import { ref, onMounted, watch } from "vue";
 import { DataFactory } from "n3";
-import { apiBaseUrlConfigKey } from "@/types";
-import { useGetRequest } from "@/composables/api";
+import { useUiStore } from "@/stores/ui";
+import { useApiRequest, useConcurrentApiRequests } from "@/composables/api";
 import { useRdfStore } from "@/composables/rdfStore";
 
 const { namedNode } = DataFactory;
 
-const apiBaseUrl = inject(apiBaseUrlConfigKey) as string;
-const { data, loading, error, doRequest } = useGetRequest();
+const ui = useUiStore();
+const { loading: datasetLoading, error: datasetError, apiGetRequest: datasetApiGetRequest } = useApiRequest(); // main request
+const { loading: collectionLoading, hasError: collectionHasError, concurrentApiRequests: collectionConcurrentApiRequests } = useConcurrentApiRequests(); // feature collections requests
 const { store, parseIntoStore, qnameToIri } = useRdfStore();
 
+const DEFAULT_LABEL_PREDICATES = [qnameToIri("rdfs:label")];
+
 const props = defineProps<{
     defaultSelected?: {
         dataset?: string;
@@ -28,6 +31,7 @@ const emit = defineEmits<{
 interface Option {
     iri: string;
     title?: string;
+    link: string;
 };
 
 const datasetOptions = ref<Option[]>([]);
@@ -57,54 +61,67 @@ watch(() => props.defaultSelected, (newValue, oldValue) => {
         collectionSelected.value = newValue.collection?.split(",") || [];
         emitOptions();
     }
-}, {deep: true});
+}, { deep: true });
+
+onMounted(async () => {
+    // get list of datasets
+    const { data: datasetData, profiles: datasetProfiles } = await datasetApiGetRequest("/s/datasets");
 
-onMounted(() => {
-    // get dataset list
-    doRequest(`${apiBaseUrl}/s/datasets`, () => {
-        parseIntoStore(data.value);
+    if (datasetData && datasetProfiles.length > 0 && !datasetError.value) {
+        const defaultProfile = ui.profiles[datasetProfiles.find(p => p.default)!.uri];
+        const labelPredicates = defaultProfile.labelPredicates.length > 0 ? defaultProfile.labelPredicates : DEFAULT_LABEL_PREDICATES;
 
-        store.value.forSubjects(member => {
-            let option: Option = {
-                iri: member.value
-            };
+        parseIntoStore(datasetData);
 
-            let datasetLink = "";
-            let datasetIRI = member.value;
+        store.value.forSubjects(async (member) => {
+            let title = "";
+            let link = "";
             
             store.value.forEach(q => { // get preds & objs for each subj
-                if (q.predicate.value === qnameToIri("dcterms:title")) {
-                    option.title = q.object.value;
+                if (labelPredicates.includes(q.predicate.value)) {
+                    title = q.object.value;
                 } else if (q.predicate.value === qnameToIri("prez:link")) {
-                    datasetLink = q.object.value;
+                    link = q.object.value;
                 }
             }, member, null, null, null);
-            datasetOptions.value.push(option);
-
-            // get feature collection list
-            if (datasetLink !== "") {
-                const { data: collectionData, loading: collectionLoading, error: collectionError, doRequest: collectionDoRequest } = useGetRequest();
-                const { store: collectionStore, parseIntoStore: collectionParseIntoStore, qnameToIri: collectionQnameToIri } = useRdfStore();
-                
-                collectionDoRequest(`${apiBaseUrl}${datasetLink}/collections`, () => {
-                    collectionParseIntoStore(collectionData.value);
-
-                    collectionStore.value.forObjects(member => {
-                        let option: Option = {
-                            iri: member.value
-                        };
-                        
-                        collectionStore.value.forEach(q => { // get preds & objs for each subj
-                            if (q.predicate.value === collectionQnameToIri("rdfs:label")) {
-                                option.title = q.object.value;
-                            }
-                        }, member, null, null, null);
-                        collectionOptions.value.push(option);
-                    }, namedNode(datasetIRI), namedNode(collectionQnameToIri("rdfs:member")), null);
-                });
-            }
+            
+            datasetOptions.value.push({
+                iri: member.value,
+                title: title || undefined,
+                link: link
+            });
         }, namedNode(qnameToIri("a")), namedNode(qnameToIri("dcat:Dataset")), null);
-    });
+        
+        // get list of feature collections
+        const collectionData = await collectionConcurrentApiRequests(datasetOptions.value.map(d => `${d.link}/collections`));
+
+        collectionData.forEach(r => {
+            if (r.value) {
+                parseIntoStore(r.value);
+            }
+        });
+
+        datasetOptions.value.forEach(d => {
+            store.value.forObjects(member => {
+                let title = "";
+                let link = "";
+            
+                store.value.forEach(q => { // get preds & objs for each subj
+                    if (q.predicate.value === qnameToIri("rdfs:label")) { // need label predicates from profile
+                        title = q.object.value;
+                    } else if (q.predicate.value === qnameToIri("prez:link")) {
+                        link = q.object.value;
+                    }
+                }, member, null, null, null);
+
+                collectionOptions.value.push({
+                    iri: member.value,
+                    title: title || undefined,
+                    link: link
+                });
+            }, namedNode(d.iri), namedNode(qnameToIri("rdfs:member")), null);
+        });
+    }
 });
 </script>
 
diff --git a/src/components/search/SpacePrezSearchMap.vue b/src/components/search/SpacePrezSearchMap.vue
index ef8bfdd..cadd4ba 100644
--- a/src/components/search/SpacePrezSearchMap.vue
+++ b/src/components/search/SpacePrezSearchMap.vue
@@ -1,60 +1,72 @@
 <script lang="ts" setup>
-import { ref, onMounted, inject, computed } from "vue";
-
-// the searchable map component and related map type definitions
-import MapClient from "@/components/MapClient.vue";
+import { ref, computed, inject, onMounted, watch } from "vue";
+import { DataFactory } from "n3";
+import { apiBaseUrlConfigKey, mapConfigKey, type MapConfig, type ProfileHeader } from "@/types";
+import { useUiStore } from "@/stores/ui";
+import { useApiRequest, useConcurrentApiRequests, useSparqlRequest } from "@/composables/api";
+import { useRdfStore } from "@/composables/rdfStore";
+import { copyToClipboard, sortByTitle } from "@/util/helpers";
 import { AreaTypes, ShapeTypes, type Coords } from "@/components/MapClient.d";
-
-// the pinia search store and related type definitions to manage the returned dataset tree
-import { datasetsStore } from "@/stores/datasetsStore";
-import type { DatasetTree, DatasetTreeNode } from "@/stores/datasetsStore.d"
-
-// sparql query generation
-import { mapSearchToSparql } from "@/util/mapSearchHelper"
-import { mapConfigKey, type MapConfig } from "@/types";
-import { convertConfigTypes } from "@/util/mapSearchHelper"
-
-// a general button group component to render a set of buttons
-import ButtonGroup from "@/components/ButtonGroup.vue";
-
-// turn a list of enums into a a set of options for the button group
-import { enumToOptions } from "@/util/mapSearchHelper"
-import { mapSearchStore } from "@/stores/mapSearchStore";
-import type { WKTResult } from "@/stores/mapSearchStore.d"
-import { copyToClipboard } from "@/util/helpers";
+import { enumToOptions } from "@/util/mapSearchHelper";
+import MapClient from "@/components/MapClient.vue";
 import LoadingMessage from "@/components/LoadingMessage.vue";
 import ErrorMessage from "@/components/ErrorMessage.vue";
 import BaseModal from "@/components/BaseModal.vue";
+import ButtonGroup from "@/components/ButtonGroup.vue";
+import { spatialSearchQuery } from "@/sparqlQueries/spatialSearch";
 
-// show debug info at the bottom of the page, could be moved to config
-const debugMode = false
-
-// get the default map settings
-const mapConfig = convertConfigTypes(inject(mapConfigKey)) as MapConfig;
-
-// the search store setup
-const datasets = datasetsStore()
-const mapSearch = mapSearchStore()
-const datasetTreeRef = ref<DatasetTree>([])
-const selectedDatasetsRef = ref<string[]>([])
-const selectedFeaturesRef = ref<string[]>([])
-
-// map info refs
-const searchMapRef = ref()
-const shapeTypeRef = ref(ShapeTypes.None)
-const coordsRef = ref<Coords>([])
-const areaTypeRef = ref(AreaTypes.Nearby)
-const radiusRef = ref(5)
-const limitRef = ref(10)
-const showQueryRef = ref(false)
-const sparqlQueryRef = ref("")
-const initialAreaTypeRef = ref(AreaTypes.Nearby)
+const { namedNode } = DataFactory;
 
-const datasetCollapse = ref({} as {[key: string]: boolean});
-const modal = ref<string | null>(null);
+type Option = {
+    title?: string;
+    iri: string;
+};
 
-// to hold the wkt shape response from the map search
-const responseRef = ref<WKTResult[]>()
+type SparqlBinding = {
+    [key: string]: {
+        type: string;
+        datatype?: string;
+        value: string;
+        "xml:lang"?: string;
+    }
+};
+
+const apiBaseUrl = inject(apiBaseUrlConfigKey) as string;
+const mapConfig = inject(mapConfigKey) as MapConfig;
+
+const ui = useUiStore();
+const { loading: datasetLoading, error: datasetError, apiGetRequest: datasetApiGetRequest } = useApiRequest(); // list of datasets
+const { loading: fcLoading, hasError: fcError, concurrentApiRequests: fcConcurrentApiRequests } = useConcurrentApiRequests(); // concurrent lists of feature collections
+const { loading: searchLoading, error: searchError, sparqlGetRequest: searchSparqlGetRequest } = useSparqlRequest(); // spatial search SPARQL query
+const { store, parseIntoStore, qnameToIri } = useRdfStore();
+
+const LIVE_SEARCH = true;
+const DEFAULT_LABEL_PREDICATES = [qnameToIri("dcterms:title")];
+const AREA_BUTTONS = enumToOptions(AreaTypes)
+
+const datasets = ref<(Option & {link: string, featureCollections: Option[]})[]>([]);
+const selectedDatasets = ref<string[]>([]);
+const selectedFeatureCollections = ref<string[]>([]);
+const shape = ref<{
+    type: ShapeTypes;
+    coords: Coords;
+}>({
+    type: ShapeTypes.None,
+    coords: []
+});
+const spatialSelectionType = ref<AreaTypes>(AreaTypes.Nearby);
+const showQuery = ref(false);
+const limit = ref(10);
+const radius = ref(5);
+const results = ref<{
+    uri: string;
+    link: string;
+    wkt: string;
+    fcLabel: string;
+    label: string;
+}[]>([]);
+const datasetCollapse = ref<{[key: string]: boolean}>({});
+const searchMap = ref<typeof MapClient | null>(null);
 
 const allDatasetsCollapsed = computed(() => {
     return Object.values(datasetCollapse.value).every(isCollapsed => isCollapsed);
@@ -62,12 +74,12 @@ const allDatasetsCollapsed = computed(() => {
 
 const allDatasetsSelected = computed(() => {
     let allSelected = true;
-    datasetTreeRef.value.forEach(dataset => {
-        if (!selectedDatasetsRef.value.includes(dataset.item.subject)) {
+    datasets.value.forEach(dataset => {
+        if (!selectedDatasets.value.includes(dataset.iri)) {
             allSelected = false;
             return false;
         } else {
-            if (!dataset.featureCollections.every(fc => selectedFeaturesRef.value.includes(fc.subject))) {
+            if (!dataset.featureCollections.every(fc => selectedFeatureCollections.value.includes(fc.iri))) {
                 allSelected = false;
                 return false;
             }
@@ -76,122 +88,209 @@ const allDatasetsSelected = computed(() => {
     return allSelected;
 });
 
-/** Opens/collapses all datasets */
-function toggleCollapseDatasets() {
-    let collapsed: {[key: string]: boolean} = {};
-    Object.keys(datasetCollapse.value).forEach(dataset => collapsed[dataset] = !allDatasetsCollapsed.value);
-    datasetCollapse.value = collapsed;
-}
+const query = computed(() => {
+    return spatialSearchQuery(
+        selectedFeatureCollections.value,
+        shape.value.coords,
+        spatialSelectionType.value,
+        radius.value,
+        limit.value,
+        mapConfig.search
+    );
+});
 
-/** Selects/unselects all datasets & feature collections */
-async function toggleSelectAll() {
-    let selectedDatasets: string[] = [];
+function toggleAllDatasets() {
+    let selectedDs: string[] = [];
     let selectedFcs: string[] = [];
     if (!allDatasetsSelected.value) {
-        datasetTreeRef.value.forEach(dataset => {
-            selectedDatasets.push(dataset.item.subject);
-            selectedFcs = [...selectedFcs, ...dataset.featureCollections.map(fc => fc.subject)];
+        datasets.value.forEach(dataset => {
+            selectedDs.push(dataset.iri);
+            selectedFcs = [...selectedFcs, ...dataset.featureCollections.map(fc => fc.iri)];
         });
     }
-    selectedDatasetsRef.value = selectedDatasets;
-    selectedFeaturesRef.value = selectedFcs;
-
-    await performMapSearch();
+    selectedDatasets.value = selectedDs;
+    selectedFeatureCollections.value = selectedFcs;
 }
 
-/** search for any shapes that should be added to the map */
-const performMapSearch = async () => {
-    sparqlQueryRef.value = mapSearchToSparql(
-        selectedFeaturesRef.value,
-        coordsRef.value,
-        areaTypeRef.value,
-        radiusRef.value,
-        limitRef.value,
-        mapConfig.search
-    )
-    await mapSearch.searchMap(sparqlQueryRef.value)
-    if (mapSearch.success) {
-        // responseRef is only updated to show in the debug window, if active
-        responseRef.value = mapSearch.data
-        // draw the shape onto the map
-        searchMapRef.value.drawShape(mapSearch.data)
+function toggleFeatureCollections(dataset: (Option & {link: string, featureCollections: Option[]}), checked: boolean) {
+    if (checked) {
+        dataset.featureCollections.forEach(fc => {
+            if (!selectedFeatureCollections.value.includes(fc.iri)) {
+                selectedFeatureCollections.value.push(fc.iri);
+            }
+        });
+    } else {
+        // If it's unchecked, remove all feature collections from selectedFeatureCollections    
+        dataset.featureCollections.forEach(fc => {
+            const index = selectedFeatureCollections.value.indexOf(fc.iri);
+            if (index >= 0) {
+                selectedFeatureCollections.value.splice(index, 1);
+            }
+        });
     }
 }
 
-/** get the data from the search store  */
-const fetchData = async () => {
-    await datasets.fetchSpacePrezData()
-    if (datasets.success) {
-        datasetTreeRef.value = datasets.getDatasetTree()
-    }
+function toggleCollapseAllDatasets() {
+    let collapsed: {[key: string]: boolean} = {};
+    Object.keys(datasetCollapse.value).forEach(dataset => collapsed[dataset] = !allDatasetsCollapsed.value);
+    datasetCollapse.value = collapsed;
 }
 
-// start off by loading the SPARQL query result data into the search store
-onMounted(async () => {
-    await fetchData()
-
-    // start with all items selected
-    datasetTreeRef.value.forEach(ds => {
-        datasetCollapse.value[ds.item.subject] = true;
-        selectedDatasetsRef.value.push(ds.item.subject)
-        ds.featureCollections.forEach(fc => {
-            selectedFeaturesRef.value.push(fc.subject)
-        })
-    })
+function handleSpatialSelectionChange(values: AreaTypes[]) {
+    spatialSelectionType.value = values[0];
+}
 
-})
+function handleMapSelectionChange(selectedCoords: Coords, shapeType: ShapeTypes) {
+    shape.value = {
+        type: shapeType,
+        coords: selectedCoords
+    };
 
-// called when a selection has changed
-const updateSelection = async (selectedCoords: Coords, shapeType: ShapeTypes) => {
-    //shapeTypeRef.value = selectedCoords.length == 0 ? ShapeTypes.None : (selectedCoords.length == 1 ? ShapeTypes.Point : ShapeTypes.Polygon)
-    shapeTypeRef.value = shapeType
-    coordsRef.value = selectedCoords
-    // only search when we have shape type provided
     if (shapeType != ShapeTypes.None) {
         if (shapeType == ShapeTypes.Point) {
-            initialAreaTypeRef.value = AreaTypes.Nearby
-            areaTypeRef.value = AreaTypes.Nearby
+            spatialSelectionType.value = AreaTypes.Nearby;
         } else {
-            initialAreaTypeRef.value = AreaTypes.Contains
-            areaTypeRef.value = AreaTypes.Contains
+            spatialSelectionType.value = AreaTypes.Contains;
         }
-        await performMapSearch()
     }
 }
 
-// convert out areatypes into a list of options format to show as buttons
-const areaButtons = enumToOptions(AreaTypes)
+/**
+ * Gets the list of Datasets from the API endpoint `/s/datasets` & creates the list of dataset options
+ */
+async function getDatasets() {
+    const { data, profiles } = await datasetApiGetRequest("/s/datasets");
+    if (data && profiles.length > 0 && !datasetError.value) {
+        const defaultProfile = ui.profiles[profiles.find(p => p.default)!.uri];
+        const labelPredicates = defaultProfile.labelPredicates.length > 0 ? defaultProfile.labelPredicates : DEFAULT_LABEL_PREDICATES;
+
+        parseIntoStore(data);
+
+        const datasetOptions: {[key: string]: (Option & {link: string, featureCollections: Option[]})} = {};
+
+        store.value.forSubjects(subject => {
+            const dataset: (Option & {link: string, featureCollections: Option[]}) = {
+                iri: subject.value,
+                link: "",
+                featureCollections: []
+            };
+
+            store.value.forEach(q => {
+                if (labelPredicates.includes(q.predicate.value)) {
+                    dataset.title = q.object.value;
+                } else if (q.predicate.value === qnameToIri("prez:link")) {
+                    dataset.link = q.object.value;
+                }
+            }, subject, null, null, null);
 
-// triggered when a change of area type has been clicked
-const handleAreaButtonChange = async (values: AreaTypes[]) => {
-    initialAreaTypeRef.value = values[0]
-    areaTypeRef.value = values[0]
-    await performMapSearch()
-}
+            datasetOptions[subject.value] = dataset;
+        }, namedNode(qnameToIri("a")), namedNode(qnameToIri("dcat:Dataset")), null);
 
-/** toggle selected features under a dataset */
-const toggleAllFeatures = async (datasetNode: DatasetTreeNode, checked: boolean) => {
-    // If the "select all" checkbox is checked, add all feature collections to selectedFeatures
-    //alert(checked + ',' + JSON.stringify(selectedDatasetsRef.toString()))
-    if (checked) {
-        datasetNode.featureCollections.forEach(fc => {
-            if (!selectedFeaturesRef.value.includes(fc.subject)) {
-                selectedFeaturesRef.value.push(fc.subject);
+        const fcData = await fcConcurrentApiRequests(Object.values(datasetOptions).map(d => `${d.link}/collections`));
+        let fcProfiles: ProfileHeader[] = [];
+
+        fcData.forEach((r, index) => {
+            if (r.value) {
+                parseIntoStore(r.value);
             }
-        })
-    } else {
-        // If it's unchecked, remove all feature collections from selectedFeatures    
-        datasetNode.featureCollections.forEach(fc => {
-            const index = selectedFeaturesRef.value.indexOf(fc.subject);
-            if (index >= 0) {
-                selectedFeaturesRef.value.splice(index, 1);
+            if (index === 0 && r.profiles) {
+                fcProfiles = r.profiles;
             }
         });
+
+        const fcDefaultProfile = ui.profiles[fcProfiles.find(p => p.default)!.uri];
+        const fcLabelPredicates = fcDefaultProfile.labelPredicates.length > 0 ? fcDefaultProfile.labelPredicates : DEFAULT_LABEL_PREDICATES;
+
+        store.value.forSubjects(subject => { // get datasets
+            store.value.forObjects(object => { // get fcs per dataset
+                const fc: Option = {
+                    iri: object.value
+                };
+                store.value.forEach(q => { // fc triples
+                    if (fcLabelPredicates.includes(q.predicate.value)) {
+                        fc.title = q.object.value;
+                    }
+                }, object, null, null, null);
+                datasetOptions[subject.value].featureCollections.push(fc);
+            }, subject, namedNode(qnameToIri("rdfs:member")), null);
+
+            // sort by title first, then by IRI if no title
+            datasetOptions[subject.value].featureCollections.sort(sortByTitle);
+        }, namedNode(qnameToIri("a")), namedNode(qnameToIri("dcat:Dataset")), null);
+
+        // sort by title first, then by IRI if no title
+        datasets.value = Object.values(datasetOptions).sort(sortByTitle);
     }
-    await performMapSearch()
-    return true
 }
 
+async function doSearch() {
+    if (shape.value.coords.length > 0) {
+        const searchData = await searchSparqlGetRequest(`${apiBaseUrl}/sparql`, query.value);
+        if (searchData && !searchError.value) {
+            results.value = (searchData.results.bindings as SparqlBinding[]).map(result => {
+                return {
+                    uri: result.f_uri.value,
+                    link: `/object?uri=${encodeURIComponent(result.f_uri.value)}`,
+                    wkt: result.wkt.value,
+                    fcLabel: result.fc_label ? result.fc_label.value : "",
+                    label: result.f_label ? result.f_label.value : ""
+                }
+            });
+            if (searchMap.value) {
+                searchMap.value.drawShape(results.value);
+            }
+        }
+    }
+}
+
+watch(selectedDatasets, async (newValue, oldValue) => {
+    if (LIVE_SEARCH) {
+        await doSearch();
+    }
+}, { deep: true });
+
+watch(selectedFeatureCollections, async (newValue, oldValue) => {
+    if (LIVE_SEARCH) {
+        await doSearch();
+    }
+}, { deep: true });
+
+watch(limit, async (newValue, oldValue) => {
+    if (LIVE_SEARCH) {
+        await doSearch();
+    }
+});
+
+watch(radius, async (newValue, oldValue) => {
+    if (LIVE_SEARCH) {
+        await doSearch();
+    }
+});
+
+watch(shape, async (newValue, oldValue) => {
+    if (LIVE_SEARCH) {
+        await doSearch();
+    }
+}, { deep: true });
+
+watch(spatialSelectionType, async (newValue, oldValue) => {
+    if (LIVE_SEARCH) {
+        await doSearch();
+    }
+});
+
+onMounted(async () => {
+    await getDatasets();
+
+    // select all by default
+    datasets.value.forEach(dataset => {
+        datasetCollapse.value[dataset.iri] = true;
+        selectedDatasets.value.push(dataset.iri);
+        dataset.featureCollections.forEach(fc => {
+            selectedFeatureCollections.value.push(fc.iri);
+        });
+    });
+})
 </script>
 
 <template>
@@ -202,45 +301,45 @@ const toggleAllFeatures = async (datasetNode: DatasetTreeNode, checked: boolean)
                     <div class="form-section">
                         <h4>Map Selection</h4>
                         <ButtonGroup
-                            :initial-value="shapeTypeRef != ShapeTypes.None ? initialAreaTypeRef : undefined"
-                            @change="handleAreaButtonChange"
-                            :buttons="areaButtons"
+                            :initial-value="shape.type !== ShapeTypes.None ? spatialSelectionType : undefined"
+                            @change="handleSpatialSelectionChange"
+                            :buttons="AREA_BUTTONS"
                             :allowMultipleSelection="false"
-                            :disabled="shapeTypeRef == ShapeTypes.None"
+                            :disabled="shape.type === ShapeTypes.None"
                         />
-                        <div v-if="shapeTypeRef != ShapeTypes.None && areaTypeRef == AreaTypes.Nearby" style="padding-top: 10px; font-size: 0.7em">
-                            within <input type="number" class="radius-input" v-model="radiusRef" @change="performMapSearch()" min="1" max="10000" /> km
+                        <div v-if="shape.type !== ShapeTypes.None && spatialSelectionType == AreaTypes.Nearby" style="padding-top: 10px; font-size: 0.7em">
+                            within <input type="number" class="radius-input" v-model="radius" min="1" max="10000" /> km
                         </div>
                     </div>
                     <div class="form-section">
                         <h4>Datasets &amp; Feature Collections</h4>
                         <div class="dataset-buttons">
                             <div class="select-all-input">
-                                <input type="checkbox" name="select-all" id="select-all" @change="toggleSelectAll" v-model="allDatasetsSelected">
+                                <input type="checkbox" name="select-all" id="select-all" @change="toggleAllDatasets" :checked="allDatasetsSelected">
                                 <label for="select-all">Select all</label>
                             </div>
-                            <button class="btn outline sm" @click="toggleCollapseDatasets" title="Toggle collapse all datasets">
+                            <button class="btn outline sm" @click="toggleCollapseAllDatasets" title="Toggle collapse all datasets">
                                 <template v-if="allDatasetsCollapsed">Expand all <i class="fa-regular fa-chevron-down"></i></template>
                                 <template v-else>Collapse all <i class="fa-regular fa-chevron-up"></i></template>
                             </button>
                         </div>
-                        <LoadingMessage v-if="datasets.loading" />
-                        <ErrorMessage v-else-if="datasets.error" :message="`Unable to load datasets: ${datasets.error}`" />
+                        <LoadingMessage v-if="datasetLoading || fcLoading" />
+                        <ErrorMessage v-else-if="datasetError" :message="`Unable to load datasets: ${datasetError}`" />
                         <ul v-else class="dataset-options">
-                            <li v-for="(dataset, dIndex) in datasetTreeRef" class="dataset-option">
-                                <input type="checkbox" :id="`dataset-${dIndex}`" :value="dataset.item.subject" v-model="selectedDatasetsRef" @change="toggleAllFeatures(dataset, ($event.target as HTMLInputElement)?.checked)" />
-                                <label :for="`dataset-${dIndex}`">{{ dataset.item.object }}</label>
+                            <li v-for="(dataset, dIndex) in datasets" class="dataset-option">
+                                <input type="checkbox" :id="`dataset-${dIndex}`" :value="dataset.iri" v-model="selectedDatasets" @change="toggleFeatureCollections(dataset, ($event.target as HTMLInputElement)?.checked)" />
+                                <label :for="`dataset-${dIndex}`">{{ dataset.title || dataset.iri }}</label>
                                 <button
                                     class="btn outline sm dataset-collapse-btn"
-                                    @click="datasetCollapse[dataset.item.subject] = !datasetCollapse[dataset.item.subject]"
+                                    @click="datasetCollapse[dataset.iri] = !datasetCollapse[dataset.iri]"
                                     title="Toggle collapse this dataset"
                                 >
-                                    <i :class="`fa-regular fa-chevron-${datasetCollapse[dataset.item.subject] ? 'down' : 'up'}`"></i>
+                                    <i :class="`fa-regular fa-chevron-${datasetCollapse[dataset.iri] ? 'down' : 'up'}`"></i>
                                 </button>
-                                <ul v-if="dataset.featureCollections.length > 0" :class="`fc-options ${datasetCollapse[dataset.item.subject] ? 'collapse' : ''}`">
+                                <ul v-if="dataset.featureCollections.length > 0" :class="`fc-options ${datasetCollapse[dataset.iri] ? 'collapse' : ''}`">
                                     <li v-for="(fc, fcIndex) in dataset.featureCollections" class="fc-option">
-                                        <input type="checkbox" :id="`fc-${dIndex}-${fcIndex}`" :value="fc.subject" v-model="selectedFeaturesRef" @change="performMapSearch()" />
-                                        <label :for="`fc-${dIndex}-${fcIndex}`">{{ fc.object }}</label>
+                                        <input type="checkbox" :id="`fc-${dIndex}-${fcIndex}`" :value="fc.iri" v-model="selectedFeatureCollections" />
+                                        <label :for="`fc-${dIndex}-${fcIndex}`">{{ fc.title || fc.iri }}</label>
                                     </li>
                                 </ul>
                             </li>
@@ -248,30 +347,30 @@ const toggleAllFeatures = async (datasetNode: DatasetTreeNode, checked: boolean)
                     </div>
                 </div>
                 <div class="bottom-buttons">
-                    <button class="btn outline" @click="modal = 'sparqlQuery'">Show Query <i class="fa-regular fa-code"></i></button>
+                    <button class="btn outline" @click="showQuery = true">Show Query <i class="fa-regular fa-code"></i></button>
                     <div class="right-buttons">
                         <div class="result-limit-input">
                             <label for="result-limit">Result limit</label>
-                            <input id="result-limit" type="number" @change="performMapSearch()" v-model="limitRef" min="1" max="100">
+                            <input id="result-limit" type="number" v-model="limit" min="1" max="100">
                         </div>
-                        <button class="btn" @click="performMapSearch()" :disabled="shapeTypeRef == ShapeTypes.None">Search <i class="fa-regular fa-magnifying-glass"></i></button>
+                        <button class="btn" @click="doSearch()" :disabled="shape.type == ShapeTypes.None">Search <i class="fa-regular fa-magnifying-glass"></i></button>
                     </div>
                 </div>
             </div>
             <div class="search-map">
                 <MapClient
-                    ref="searchMapRef"
-                    :geo-w-k-t="responseRef"
+                    ref="searchMap"
+                    :geo-w-k-t="results"
                     :drawing-modes="['MARKER', 'POLYGON', 'RECTANGLE']"
-                    @selectionUpdated="updateSelection"
+                    @selectionUpdated="handleMapSelectionChange"
                 />
             </div>
         </div>
         <div class="results">
             <h3>Results</h3>
-            <LoadingMessage v-if="mapSearch.loading" />
-            <ErrorMessage v-else-if="mapSearch.error" :message="mapSearch.error" />
-            <table v-else-if="mapSearch.data && mapSearch.data.length > 0">
+            <LoadingMessage v-if="searchLoading" />
+            <ErrorMessage v-else-if="searchError" :message="searchError" />
+            <table v-else-if="results.length > 0">
                 <thead>
                     <tr>
                         <th>Title</th>
@@ -279,9 +378,9 @@ const toggleAllFeatures = async (datasetNode: DatasetTreeNode, checked: boolean)
                     </tr>
                 </thead>
                 <tbody>
-                    <template v-for="result in mapSearch.data">
+                    <template v-for="result in results">
                         <tr>
-                            <td><a :href="result.link">{{ result.label }}</a></td>
+                            <td><a :href="result.link">{{ result.label || result.uri }}</a></td>
                             <td>{{ result.fcLabel }}</td>
                         </tr>
                     </template>
@@ -292,13 +391,13 @@ const toggleAllFeatures = async (datasetNode: DatasetTreeNode, checked: boolean)
             </div>
         </div>
     </div>
-    <BaseModal v-if="modal === 'sparqlQuery'" @modalClosed="modal = null">
+    <BaseModal v-if="showQuery" @modalClosed="showQuery = false">
         <template #headerMiddle>Spatial Search SPARQL Query</template>
         <div class="sparql-query-content">
-            <pre>{{ sparqlQueryRef.trim() }}</pre>
+            <pre>{{ query.trim() }}</pre>
         </div>
         <template #footer>
-            <button class="btn outline sparql-copy-btn" @click="copyToClipboard(sparqlQueryRef)" title="Copy SPARQL query">Copy <i class="fa-regular fa-copy"></i></button>
+            <button class="btn outline sparql-copy-btn" @click="copyToClipboard(query)" title="Copy SPARQL query">Copy <i class="fa-regular fa-copy"></i></button>
         </template>
     </BaseModal>
 </template>
diff --git a/src/components/search/VocPrezSearch.vue b/src/components/search/VocPrezSearch.vue
index 07bc4b4..a206f26 100644
--- a/src/components/search/VocPrezSearch.vue
+++ b/src/components/search/VocPrezSearch.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup>
-import { ref, onMounted, inject, watch } from "vue";
+import { ref, onMounted, watch } from "vue";
 import { DataFactory } from "n3";
-import { apiBaseUrlConfigKey } from "@/types";
-import { useGetRequest } from "@/composables/api";
+import { useApiRequest } from "@/composables/api";
 import { useRdfStore } from "@/composables/rdfStore";
 
 const { namedNode } = DataFactory;
 
-const apiBaseUrl = inject(apiBaseUrlConfigKey) as string;
-const { data, loading, error, doRequest } = useGetRequest();
+const { loading, error, apiGetRequest } = useApiRequest();
 const { store, parseIntoStore, qnameToIri } = useRdfStore();
 
 const props = defineProps<{
@@ -34,9 +32,10 @@ watch(() => props.defaultSelected, (newValue, oldValue) => {
     }
 });
 
-onMounted(() => {
-    doRequest(`${apiBaseUrl}/v/vocab`, () => {
-        parseIntoStore(data.value);
+onMounted(async () => {
+    const { data } = await apiGetRequest("/v/vocab");
+    if (data && !error.value) {
+        parseIntoStore(data);
 
         store.value.forSubjects(member => {
             let option: VocabOption = {
@@ -50,7 +49,7 @@ onMounted(() => {
             }, member, null, null, null);
             options.value.push(option);
         }, namedNode(qnameToIri("a")), namedNode(qnameToIri("skos:ConceptScheme")), null);
-    });
+    }
 });
 </script>
 
diff --git a/src/composables/api.ts b/src/composables/api.ts
index 5ca0ecc..74d6f00 100644
--- a/src/composables/api.ts
+++ b/src/composables/api.ts
@@ -1,96 +1,287 @@
-import { ref } from "vue";
-import type { ProfileHeader, LinkObject } from "@/types";
+import { ref, inject } from "vue";
+import { apiBaseUrlConfigKey, type ProfileHeader, type LinkObject } from "@/types";
 
-// const linkHeader = `<https://www.w3.org/TR/vocab-dcat/>; rel="profile", <http://www.w3.org/ns/dx/prof/Profile>; rel="type"; token="mem"; anchor=<https://w3id.org/profile/mem>, <http://www.w3.org/ns/dx/prof/Profile>; rel="type"; token="dcat"; anchor=<https://www.w3.org/TR/vocab-dcat/>, <https://kurrawong.net/prez/DatasetList?_profile=dcat&_mediatype=text/html>; rel="self"; type="text/html"; profile="https://www.w3.org/TR/vocab-dcat/", <https://kurrawong.net/prez/DatasetList?_profile=dcat&_mediatype=text/turtle>; rel="alternate"; type="text/turtle"; profile="https://www.w3.org/TR/vocab-dcat/", <https://kurrawong.net/prez/DatasetList?_profile=dcat&_mediatype=application/rdf+xml>; rel="alternate"; type="application/rdf+xml"; profile="https://www.w3.org/TR/vocab-dcat/", <https://kurrawong.net/prez/DatasetList?_profile=dcat&_mediatype=application/ld+json>; rel="alternate"; type="application/ld+json"; profile="https://www.w3.org/TR/vocab-dcat/", <https://kurrawong.net/prez/DatasetList?_profile=mem&_mediatype=text/html>; rel="alternate"; type="text/html"; profile="https://w3id.org/profile/mem", <https://kurrawong.net/prez/DatasetList?_profile=mem&_mediatype=application/ld+json>; rel="alternate"; type="application/ld+json"; profile="https://w3id.org/profile/mem", <https://kurrawong.net/prez/DatasetList?_profile=mem&_mediatype=application/rdf+xml>; rel="alternate"; type="application/rdf+xml"; profile="https://w3id.org/profile/mem", <https://kurrawong.net/prez/DatasetList?_profile=mem&_mediatype=text/turtle>; rel="alternate"; type="text/turtle"; profile="https://w3id.org/profile/mem", <https://kurrawong.net/prez/DatasetList?_profile=mem&_mediatype=application/json>; rel="alternate"; type="application/json"; profile="https://w3id.org/profile/mem"`;
+class NetworkError extends Error {
+    constructor(message: string) {
+        super(message);
+        this.name = "NetworkError";
+    }
+}
+
+/**
+ * Parses a link header component
+ * 
+ * @param link 
+ * @returns 
+ */
+function parseLinkHeader(link: string): LinkObject {
+    const [, uriRef, attrs] = link.match(/<(.+)>; (.+)/)!;
+    let linkObj: Partial<LinkObject> = { uriRef };
+
+    attrs.split("; ").forEach(l => {
+        const [, lhs, rhs] = l.match(/(.+)=[\"<](.+)[\">]/) as [string, keyof Omit<LinkObject, "uriRef">, string];
+        linkObj[lhs] = rhs;
+    });
+
+    return linkObj as LinkObject;
+}
+
+/**
+ * Make a single async GET request, receiving turtle & profile link headers
+ * 
+ * @param url 
+ * @returns 
+ */
+async function individualApiRequest(url: string) {
+    const r = await fetch(url, {
+        method: "GET",
+        headers: {
+            "Accept": "text/anot+turtle"
+        }
+    });
+
+    if (!r.ok) {
+        throw new NetworkError(`Network error - status code ${r.status}: ${r.statusText}`);
+    }
+
+    // parse link headers for profiles
+    const profiles = r.headers.get("link") ? getProfilesFromHeaders(r.headers.get("link")!) : [];
+
+    const data = await r.text(); // always get turtle string
+    return { data, profiles };
+}
+
+/**
+ * Gets a list of profiles from Link headers
+ * 
+ * @param link 
+ * @returns 
+ */
+function getProfilesFromHeaders(link: string): ProfileHeader[] {
+    let profileObj: {[uri: string]: ProfileHeader} = {} ;
+
+    const links = link.split(", ").map(l => parseLinkHeader(l));
+
+    links.filter(l => l.rel === "type").forEach(l => {
+        profileObj[l.anchor] = {
+            default: false,
+            token: l.token,
+            mediatypes: [],
+            title: l.title,
+            description: "",
+            uri: l.anchor
+        };
+    });
+
+    const defaultProfile = links.find(l => l.rel === "self")!;
+    profileObj[defaultProfile.profile].default = true;
 
+    links.filter(l => l.rel === "alternate").forEach(l => {
+        if (!profileObj[l.profile].mediatypes.map(m => m.mediatype).includes(l.type)) {
+            profileObj[l.profile].mediatypes.push({ title: "", mediatype: l.type, default: false });
+        }
+    });
+
+    // need to sort mediatypes by default first - need to use ui.profiles
+
+    return Object.values(profileObj);
+}
+
+/**
+ * Used for making async GET requests
+ * 
+ * @returns 
+ */
 export function useGetRequest() {
-    const data = ref("");
     const loading = ref(false);
     const error = ref("");
-    const profiles = ref<ProfileHeader[]>([]);
 
-    function parseLinkHeader(link: string): LinkObject {
-        const [, uriRef, attrs] = link.match(/<(.+)>; (.+)/)!;
-        let linkObj: Partial<LinkObject> = { uriRef };
+    /**
+     * Perform an async GET request
+     * 
+     * @param url 
+     * @param headers 
+     * @returns 
+     */
+    async function getRequest(url: string, headers: {[key: string]: string}) {
+        loading.value = true;
+        let data: string = "";
 
-        attrs.split("; ").forEach(l => {
-            const [, lhs, rhs] = l.match(/(.+)=[\"<](.+)[\">]/) as [string, keyof Omit<LinkObject, "uriRef">, string];
-            linkObj[lhs] = rhs;
-        });
+        try {
+            const r = await fetch(url, {
+                method: "GET",
+                headers: headers
+            });
+        
+            if (!r.ok) {
+                throw new NetworkError(`Network error - status code ${r.status}: ${r.statusText}`);
+            }
+        
+        
+            data = await r.text(); // always get turtle string
+        } catch (e) {
+            if (e instanceof TypeError) { // TypeError - fetch error
+                error.value = e.message;
+            } else if (e instanceof NetworkError) { // NetworkError - status code error
+                error.value = e.message;
+            } else if (e instanceof SyntaxError) { // SyntaxError - .text() parsing error
+                error.value = e.message;
+            }
+        }
 
-        return linkObj as LinkObject;
-    }
+        loading.value = false;
+        return data;
+    };
 
-    function getProfilesFromHeaders(link: string): ProfileHeader[] {
-        let profileObj: {[uri: string]: ProfileHeader} = {} ;
+    return {
+        loading,
+        error,
+        getRequest
+    };
+};
 
-        const links = link.split(", ").map(l => parseLinkHeader(l));
+/**
+ * Used for making async API requests to the Prez backend
+ * 
+ * @returns 
+ */
+export function useApiRequest() {
+    const apiBaseUrl = inject(apiBaseUrlConfigKey) as string;
+    const loading = ref(false);
+    const error = ref("");
 
-        links.filter(l => l.rel === "type").forEach(l => {
-            profileObj[l.anchor] = {
-                default: false,
-                token: l.token,
-                mediatypes: [],
-                title: l.title,
-                description: "",
-                uri: l.anchor
-            };
-        });
+    /**
+     * Perform an async GET request to the Prez API
+     * 
+     * @param path 
+     * @returns data, profiles
+     */
+    async function apiGetRequest(path: string) {
+        loading.value = true;
+        let data: string = "";
+        let profiles: ProfileHeader[] = [];
+
+        try {
+            ({ data, profiles } = await individualApiRequest(`${apiBaseUrl}${path}`));
+        } catch (e) {
+            if (e instanceof TypeError) { // TypeError - fetch error
+                error.value = e.message;
+            } else if (e instanceof NetworkError) { // NetworkError - status code error
+                error.value = e.message;
+            } else if (e instanceof SyntaxError) { // SyntaxError - .text() parsing error
+                error.value = e.message;
+            }
+        }
+
+        loading.value = false;
+        return { data, profiles };
+    };
+
+    return {
+        loading,
+        error,
+        apiGetRequest
+    };
+};
+
+/**
+ * Used for making multiple concurrent async API requests to the Prez backend
+ * 
+ * @returns 
+ */
+export function useConcurrentApiRequests() {
+    const apiBaseUrl = inject(apiBaseUrlConfigKey) as string;
+    const loading = ref(false);
+    const hasError = ref(false);
 
-        const defaultProfile = links.find(l => l.rel === "self")!;
-        profileObj[defaultProfile.profile].default = true;
+    /**
+     * Perform multiple concurrent async GET requests to the Prez API
+     * 
+     * @param path 
+     * @returns data
+     */
+    async function concurrentApiRequests(paths: string[]) {
+        loading.value = true;
+        let data: {
+            value: string;
+            profiles: ProfileHeader[];
+            error: any;
+        }[] = [];
 
-        links.filter(l => l.rel === "alternate").forEach(l => {
-            if (!profileObj[l.profile].mediatypes.map(m => m.mediatype).includes(l.type)) {
-                profileObj[l.profile].mediatypes.push({ title: "", mediatype: l.type, default: false });
+        await Promise.allSettled(paths.map(path => individualApiRequest(`${apiBaseUrl}${path}`))).then(resp => {
+            if (!resp.every(r => r.status === "fulfilled")) {
+                hasError.value = true;
             }
+            
+            data = resp.map(r => {
+                return {
+                    value: r.status === "fulfilled" ? r.value.data: "",
+                    profiles: r.status === "fulfilled" ? r.value.profiles : [],
+                    error: r.status === "fulfilled" ? "" : r.reason
+                };
+            });
         });
 
-        // need to sort mediatypes by default first - need to use ui.profiles
+        loading.value = false;
+        return data;
+    };
 
-        return Object.values(profileObj);
-    }
+    return {
+        loading,
+        hasError,
+        concurrentApiRequests
+    };
+};
 
-    function doRequest(url: string, callback = () => {}, errorCallback = () => {}) {
+/**
+ * Used for making async SPARQL requests
+ */
+export function useSparqlRequest() {
+    const loading = ref(false);
+    const error = ref("");
+    
+    /**
+     * Perform an async SPARQL GET request
+     * 
+     * @param path 
+     * @returns data
+     */
+    async function sparqlGetRequest(url: string, query: string) {
         loading.value = true;
+        let data: any = "";
+        let isGraphQuery = ["CONSTRUCT", "DESCRIBE"].some(e => query.includes(e));
 
-        fetch(url)
-        .then(r => {
-            // console.log("got response")
-            // console.log("response", r)
+        try {
+            const r = await fetch(`${url}?query=${encodeURIComponent(query)}`, {
+                method: "GET",
+                headers: {
+                    "Accept": isGraphQuery ? "text/turtle" : "application/sparql-results+json"
+                }
+            });
+        
             if (!r.ok) {
-                // console.log("not ok", r)
-                // console.log(r.status)
-                // console.log(r.statusText)
-                // console.log(r.text())
-                // throw new Error(`Response was not OK: status ${r.status}`);
-                return Promise.reject(r); // returns a Response object to catch() to access status, etc.
+                throw new NetworkError(`Network error - status code ${r.status}: ${r.statusText}`);
             }
-            profiles.value = r.headers.get("link") ? getProfilesFromHeaders(r.headers.get("link")!) : [];
-            return r.text();
-        })
-        .then(text => {
-            data.value = text;
-            callback();
-        })
-        .catch(e => {
-            // console.log("error", e)
-            if (e instanceof TypeError) { // generic JS network error
-                // console.log("generic error")
-                // console.log("message", e.message)
+        
+        
+            data = isGraphQuery ? await r.text() : await r.json();
+        } catch (e) {
+            if (e instanceof TypeError) { // TypeError - fetch error
+                error.value = e.message;
+            } else if (e instanceof NetworkError) { // NetworkError - status code error
+                error.value = e.message;
+            } else if (e instanceof SyntaxError) { // SyntaxError - .text() parsing error
                 error.value = e.message;
-            } else if (e instanceof Response) {
-                // console.log("response error")
-                // console.log("status", e.status)
-                error.value = e.statusText;
             }
-            
-            errorCallback();
-        })
-        .finally(() => {
-            loading.value = false;
-        });
-    }
+        }
+
+        loading.value = false;
+        return data;
+    };
 
-    return { data, profiles, loading, error, doRequest };
+    return {
+        loading,
+        error,
+        sparqlGetRequest
+    };
 };
\ No newline at end of file
diff --git a/src/sparqlQueries/catalogSearch.ts b/src/sparqlQueries/catalogSearch.ts
new file mode 100644
index 0000000..5823825
--- /dev/null
+++ b/src/sparqlQueries/catalogSearch.ts
@@ -0,0 +1,98 @@
+/**
+ * Creates a SPARQL query that selects the top 10 most common themes
+ * 
+ * @param catalogs 
+ * @returns 
+ */
+export function getThemesQuery(catalogs: string[] = []): string {
+    return `
+    PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+    PREFIX dcat: <http://www.w3.org/ns/dcat#>
+    PREFIX dcterms: <http://purl.org/dc/terms/>
+    
+    SELECT ?theme ?title (COUNT(?theme) AS ?count)
+    WHERE {
+        ?resource a dcat:Resource ;
+            ^dcterms:hasPart ?hasPart .
+        ${catalogs.length > 0 ? `FILTER (?hasPart IN (${catalogs.map(cat=>`<${cat}>`).join(', ')}))` : ``}  
+        ?resource dcat:theme ?theme .
+        ?theme skos:prefLabel ?title .
+    }
+    GROUP BY ?theme ?title
+    ORDER BY DESC(?count) ?title
+    LIMIT 10`;
+}
+
+/**
+ * Creates a SPARQL query that searches dcat:Resoures filtered by catalog, themes, geometry and weighted text search
+ * 
+ * @param catalogs 
+ * @param searchTerm 
+ * @param themes 
+ * @param shape 
+ * @param limit 
+ * @returns 
+ */
+export function catalogSpatialSearch(catalogs: string[] = [], searchTerm: string = "", themes: string[] = [], shape: string = "", limit: number = 0): string {
+    return `
+    PREFIX dcat: <http://www.w3.org/ns/dcat#>
+    PREFIX dcterms: <http://purl.org/dc/terms/>
+    PREFIX geo: <http://www.opengis.net/ont/geosparql#>
+    PREFIX geof: <http://www.opengis.net/def/function/geosparql/>
+    PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+
+    SELECT ?resource ?title ?desc (GROUP_CONCAT(?theme;separator="\t") AS ?themeList) (GROUP_CONCAT(?themeLabel;separator="\t") AS ?themeListLabels) ?weight
+    WHERE {
+        # Only look for Resources (not spatial Datasets)
+        ?resource a dcat:Resource .
+
+        # Only look in selected cats
+        ?resource ^dcterms:hasPart ?hasPart .
+        ${catalogs.length > 0 ? `FILTER (?hasPart IN (${catalogs.map(cat=>`<${cat}>`).join(', ')}))` : ``}
+
+        # Weighted text search
+        {
+            SELECT DISTINCT ?resource ?title ?desc (SUM(?w) AS ?weight)
+            WHERE {
+                ?resource a dcat:Resource .
+                {
+                    ?resource
+                        dcterms:title ?title ;
+                        dcterms:description ?desc ;
+                        .
+                    BIND (50 AS ?w)
+                    FILTER REGEX(?title, "^${searchTerm}$", "i")
+                } UNION {
+                    ?resource 
+                        dcterms:title ?title ;
+                        dcterms:description ?desc ;
+                        .
+                    BIND (10 AS ?w)
+                    FILTER REGEX(?title, "${searchTerm}", "i")
+                    FILTER(?desc!="")
+                } UNION {
+                    ?resource 
+                        dcterms:title ?title ;
+                        dcterms:description ?desc ;
+                        .
+                    BIND (5 AS ?w)
+                    FILTER REGEX(?desc, "${searchTerm}", "i")
+                }  
+            }
+            GROUP BY ?resource ?title ?desc ?match
+            ORDER BY DESC(?weight) ?title
+        }
+
+        # Theme filter. each theme's IRI is a new line in the VALUES {}
+        ${themes.length > 0 ? `VALUES ?theme { ${themes.map(theme=>`<${theme}>`).join(' ')} }` : ``}
+        ?resource dcat:theme ?theme .
+        ?theme skos:prefLabel ?themeLabel .
+
+        # Spatial Filter
+        ${shape != '' ? `
+        ?resource geo:hasBoundingBox/geo:asWKT ?wkt ;
+        FILTER (geof:sfOverlaps("${shape})"^^geo:wktLiteral, ?wkt))` : ``}
+
+    } GROUP BY ?resource ?title ?desc ?weight
+    ${limit > 0 ? `LIMIT ${limit}` : ``}`;
+}
\ No newline at end of file
diff --git a/src/sparqlQueries/spatialSearch.ts b/src/sparqlQueries/spatialSearch.ts
new file mode 100644
index 0000000..316cd3f
--- /dev/null
+++ b/src/sparqlQueries/spatialSearch.ts
@@ -0,0 +1,65 @@
+import { AreaTypes, type Coords } from "@/components/MapClient.d";
+import type { MapSearchConfig } from "@/types";
+
+export function spatialSearchQuery(
+    featureCollections: string[],
+    coords: Coords,
+    areaType: AreaTypes,
+    radius: number,
+    limit: number,
+    config: MapSearchConfig
+): string {
+    let shape: string;
+    if (coords.length == 0) {
+        shape = '';
+    } else if (coords.length == 1) {
+        const coord = coords[0];
+        shape = `POINT (${coord[0]} ${coord[1]})`;
+    } else {
+        shape = `POLYGON ((${coords.map(coord => `${coord[0]} ${coord[1]}`).join(', ')}))`;
+    }
+
+    let spatialFilter = "";
+    
+    switch(areaType) {
+        case AreaTypes.Contains:
+            spatialFilter = `FILTER (geof:sfContains("${shape}"^^geo:wktLiteral, ?wkt))`;
+            break;
+        case AreaTypes.Within:
+            spatialFilter = `FILTER (geof:sfWithin("${shape}"^^geo:wktLiteral, ?wkt))`;
+            break;
+        case AreaTypes.Nearby:
+            spatialFilter = `FILTER (spatialF:nearby("${shape}"^^geo:wktLiteral, ?wkt, ${radius}, unit:kilometre))`;
+            break;
+        case AreaTypes.Overlaps:
+            spatialFilter = `FILTER (geof:sfOverlaps("${shape}"^^geo:wktLiteral, ?wkt))`;
+            break;
+        default:
+            spatialFilter = '';
+    }
+
+    return `PREFIX geo: <http://www.opengis.net/ont/geosparql#>
+    PREFIX geof: <http://www.opengis.net/def/function/geosparql/>
+    PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+    PREFIX spatialF: <http://jena.apache.org/function/spatial#>
+    PREFIX unit: <http://www.opengis.net/def/uom/OGC/1.0/>
+    SELECT ?f_uri ?wkt ?fc ?fc_label ?f_label
+    WHERE {
+        ?f_uri geo:hasGeometry/geo:asWKT ?wkt .
+        
+        ${featureCollections.map(fc => {
+            return `{
+                <${fc}> rdfs:member ?f_uri ;
+                    <${config.props.fcLabel}> ?fc_label .
+                BIND (<${fc}> AS ?fc)
+            }`;
+        }).join(' UNION ')}
+
+        OPTIONAL {
+            ?f_uri <${config.props.fLabel}> ?f_label .
+        }
+
+        ${spatialFilter}
+    }
+    LIMIT ${limit}`;
+};
diff --git a/src/stores/catalogQueries.d.ts b/src/stores/catalogQueries.d.ts
deleted file mode 100644
index 364c43c..0000000
--- a/src/stores/catalogQueries.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-export type RDCatalog = {
-    c: string;
-    t: string;
-}
-
-export type RDTheme = {
-    count: string;
-    pl: string;
-    th: string;
-}
-
-export type RDSearch = {
-    r: string;
-    t: string;
-    d: string;
-    thlist: string;
-    thpllist: string;
-    weight: string;    
-}
-
diff --git a/src/stores/catalogQueries.ts b/src/stores/catalogQueries.ts
deleted file mode 100644
index 34be86f..0000000
--- a/src/stores/catalogQueries.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-export const QUERY_GET_CATALOGS = `
-PREFIX dcterms: <http://purl.org/dc/terms/>
-PREFIX dcat: <http://www.w3.org/ns/dcat#>
-
-SELECT ?c ?t
-WHERE {
-  GRAPH ?g {
-  ?c a dcat:Catalog ;
-  	dcterms:title ?t .
-  }
-}
-ORDER BY ?t`
-
-export function QUERY_GET_THEMES(catalogs:string[]=[]) {
-  return `
-PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
-PREFIX dcterms: <http://purl.org/dc/terms/>
-PREFIX dcat: <http://www.w3.org/ns/dcat#>
-SELECT ?th ?pl (COUNT(?th) AS ?count)
-WHERE {
-  ?r a dcat:Resource ;
-    ^dcterms:hasPart ?hasPart .
-  ${catalogs.length > 0 ? `FILTER (?hasPart IN (${catalogs.map(cat=>`<${cat}>`).join(', ')}))` : ``}  
-  ?r dcat:theme ?th .
-  ?th skos:prefLabel ?pl .
-}
-GROUP BY ?th ?pl
-ORDER BY DESC(?count) ?pl
-LIMIT 10`
-}
-
-export function QUERY_SEARCH(catalogs:string[]=[], searchTerms:string='', themes:string[]=[], shape:string='', limit:number=0) {
-  return `
-    PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
-    PREFIX dcat: <http://www.w3.org/ns/dcat#>
-    PREFIX dcterms: <http://purl.org/dc/terms/>
-    PREFIX geo: <http://www.opengis.net/ont/geosparql#>
-    PREFIX geof: <http://www.opengis.net/def/function/geosparql/>
-
-    SELECT ?r ?t ?d (GROUP_CONCAT(?th;separator="\t") AS ?thlist) (GROUP_CONCAT(?thpl;separator="\t") AS ?thpllist) ?weight
-    WHERE {
-        # Only look for Resources (not spatial Datasets)
-        ?r a dcat:Resource .
-
-        # Only look in selected cats
-        ?r  ^dcterms:hasPart ?hasPart  .
-        ${catalogs.length > 0 ? `FILTER (?hasPart IN (${catalogs.map(cat=>`<${cat}>`).join(', ')}))` : ``}  
-
-        # Weighted text search
-        {
-          SELECT DISTINCT ?r ?t ?d (SUM(?w) AS ?weight)
-          WHERE {
-            ?r a dcat:Resource .
-            {
-              ?r
-                dcterms:title ?t ;
-                dcterms:description ?d ;
-                .
-              BIND (50 AS ?w)
-              FILTER REGEX(?t, "^${searchTerms}$", "i")
-            }
-            UNION
-            {
-              ?r 
-                dcterms:title ?t ;
-                dcterms:description ?d ;
-                .
-              BIND (10 AS ?w)
-              FILTER REGEX(?t, "${searchTerms}", "i")
-              FILTER(?d!="")
-            }
-            UNION
-            {
-              ?r 
-                dcterms:title ?t ;
-                dcterms:description ?d ;
-                .
-              BIND (5 AS ?w)
-              FILTER REGEX(?d, "${searchTerms}", "i")
-            }  
-          }
-          GROUP BY ?r ?t ?d ?match
-          ORDER BY DESC(?weight) ?t
-        }
-
-        # Theme filter. each theme's IRI is a new line in the VALUES {}
-        ${themes.length > 0 ? `VALUES ?th { ${themes.map(theme=>`<${theme}>`).join(' ')} }` : ``}
-        ?r dcat:theme ?th .
-        ?th skos:prefLabel ?thpl .
-
-        # Spatial Filter
-        ${shape != '' ? `
-        ?r geo:hasBoundingBox/geo:asWKT ?wkt ;
-        FILTER (geof:sfOverlaps("${shape})"^^geo:wktLiteral, ?wkt))` : ``}
-
-    } GROUP BY ?r ?t ?d ?weight
-    ${limit > 0 ? `LIMIT ${limit}` : ``}`
-
-}
diff --git a/src/stores/datasetsStore.d.ts b/src/stores/datasetsStore.d.ts
deleted file mode 100644
index 26642cb..0000000
--- a/src/stores/datasetsStore.d.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { Term } from "n3"
-
-/**
- * @typedef {Object} MatchFilter - A match object type to provide to the N3 match function to filter results
- * @property {Term | null} subject - The subject term to match
- * @property {Term | null} object - The object term to match
- * @property {Term | null} predicate - The predicate term to match
- */
-export type MatchFilter = {
-    subject?: Term | null,
-    object?: Term | null,
-    predicate?: Term | null
-}
-
-/**
- * @typedef {Object} SimpleQueryResult - This simple query result object is to enable a view to easily work with a result set to display, without needing to worry about getting an id/value or processing of the literal text properly
- * @property {string} subject - The subject of the triple/quad
- * @property {string} predicate - The predicate of the triple/quad
- * @property {string} object - The object of the triple/quad, with the literal value processed if applicable
- */
-export type SimpleQueryResult = {
-  subject: string,
-  predicate: string,
-  object: string
-}
-
-/**
- * @typedef {Object} DatasetTreeNode - The node containing the item and featureCollection list
- * @property {SimpleQueryResult} item - The item being represented in the tree node
- * @property {SimpleQueryResult[]} featureCollections - The child featureCollections for the given item
- */
-export type DatasetTreeNode = {
-  item: SimpleQueryResult,
-  featureCollections: SimpleQueryResult[]
-}
-
-/**
- * @typedef {DatasetTreeNode[]} DatasetTree - This tree object provides a way to store the main list of datasets and child featureCollections
- */
-export type DatasetTree = DatasetTreeNode[]
-
diff --git a/src/stores/datasetsStore.ts b/src/stores/datasetsStore.ts
deleted file mode 100644
index d199fdf..0000000
--- a/src/stores/datasetsStore.ts
+++ /dev/null
@@ -1,202 +0,0 @@
-/**
- * This is a pinia store module that makes a sparql API query to get datasets and feature collection information. 
- * It uses the N3.js library for parsing and querying RDF data, and axios for HTTP requests.
- * This store provides a method to get a full tree representation of the datasets and their child feature collections, 
- * and a method to get a list of datasets with their titles.
- */
-import { defineStore } from 'pinia'
-import axios from 'axios'
-import { Util, Store, Parser, DataFactory, Quad } from "n3";
-const { namedNode } = DataFactory;
-import type { DatasetTree, MatchFilter, SimpleQueryResult } from '@/stores/datasetsStore.d'
-import { mapConfigKey, type MapConfig, type MapSearchConfig } from "@/types";
-import { apiBaseUrlConfigKey } from "@/types";
-import { inject } from 'vue';
-import { convertConfigTypes } from '@/util/mapSearchHelper';
-
-/**
- * SPARQL query to return all datasets and feature collections required
- */
-const getDatasetFeatureQuery = (config: MapSearchConfig) => {
-  return `PREFIX geo: <http://www.opengis.net/ont/geosparql#>
-PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX prez: <https://prez.dev/>
-
-CONSTRUCT {?ds a <${config.spatial.datasetClass}> ;
-    <${config.props.dsLabel}> ?ds_title ;
-    <${config.spatial.membershipRelationship}> ?fc .
-  ?fc a geo:FeatureCollection ;
-  <${config.props.fcLabel}> ?fc_title}
-WHERE { ?ds a <${config.spatial.datasetClass}> ;
-      <${config.spatial.membershipRelationship}> ?fc ;
-      <${config.props.dsLabel}> ?ds_title .
-  ?fc <${config.props.fcLabel}> ?fc_title
-      }`
-}
-
-/**
- * Converts a quad/triple object from N3 into a simple result type for easier template processing
- * @param {Object} quad - The quad/triple object from N3 to convert
- * @returns {SimpleQueryResult} - The simple query result object
- */
-export const quadToSimpleQueryResult = (quad:any):SimpleQueryResult => {
-  // Note: Quad type import issues, conflict with RDF library, so has an any type for now...
-  return {
-    subject: quad.subject.id,
-    predicate: quad.predicate.id,
-    object: Util.isLiteral(quad.object) ? quad.object.value : quad.object.id
-  }
-}
-
-/**
- * Main search store for processing the results of a search SPARQL query
- */
-export const datasetsStore = defineStore({
-  id: 'datasetsStore',
-
-  /**
-   * The initial store state
-   * @returns {Object}
-   */
-  state: () => {
-    // get the default map settings
-    const mapConfig = convertConfigTypes(inject(mapConfigKey)) as MapConfig;
-    const apiBaseUrl = inject(apiBaseUrlConfigKey) as string;
-    //const config = inject(configKey, defaultConfig)
-    return {
-      data: <Quad[]>[],
-      success: false,
-      store: new Store(),
-      loading: false,
-      error: null,
-      apiBaseUrl,
-      mapConfig
-    }
-  },
-
-  /**
-   * Callable actions
-   */
-  actions: {
-
-    /**
-     * Get a list of triple/quads matching the provided filter, simplified for easier template processing
-     * @param {MatchFilter} filter - The filter to match the triples/quads
-     * @returns {SimpleQueryResult[]} - The list of matching triples/quads
-     */
-    getMatchedData(filter:MatchFilter) {
-      const data:SimpleQueryResult[] = []
-
-      const { subject=null, predicate=null, object=null } = filter
-      for (const item of this.store.match(subject, predicate, object)) {
-          data.push(quadToSimpleQueryResult(item))//  {subject: item.subject.id, predicate: item.predicate.id, object: Util.isLiteral(item.object) ? item.object.value : item.object.id})
-      }
-      return data
-    },
-
-    /**
-     * Get a full tree representation of the datasets and child feature collections
-     * @returns {DatasetTree} - The tree representation of the datasets and child feature collections
-     */
-    getDatasetTree() {
-      const datasetTree:DatasetTree = [
-      ]
-      this.getDatasets().forEach(dataset=>{
-        datasetTree.push({
-          item: dataset,
-          featureCollections: this.getFeatureCollections([dataset.subject])
-        })
-      })
-      return datasetTree;
-
-    },
-
-
-    /**
-     * Get a list of dataset, performs a second match on the dataset subject to get the title
-     * @returns SimpleQueryResult array
-     */
-    getDatasets() {
-      let results: SimpleQueryResult[] = []
-      const matched = this.getMatchedData({object: namedNode(this.mapConfig.search.spatial.datasetClass)})
-      matched.forEach(itemLink=>{
-        for(const item of this.store.match(namedNode(itemLink.subject), namedNode(this.mapConfig.search.props.dsLabel))) {
-          results.push(quadToSimpleQueryResult(item))
-        }
-      })
-      return results
-    },
-
-    
-    /**
-     * Returns a list of SimpleQueryResult objects representing all feature collections for a given list of dataset subjects.
-     * If no datasetSubjects are provided, all matching feature collections will be returned.
-     * @param datasetSubjects - List of dataset subjects to filter feature collections by.
-     * @returns List of SimpleQueryResult objects representing the feature collections.
-     */
-    getFeatureCollections(datasetSubjects:string[]):SimpleQueryResult[] {
-      if(datasetSubjects.length == 0) {
-        return [] // changed to return empty
-        // simply returns all matching feature collections
-        //        return this.getMatchedData({predicate: namedNode('http://purl.org/dc/terms/title')})
-      } else {
-        // narrow down to a specific dataset
-        let results:SimpleQueryResult[] = []
-        datasetSubjects.forEach(subject=>{
-          const matchedFCs = this.getMatchedData({predicate: namedNode(this.mapConfig.search.spatial.membershipRelationship), subject: namedNode(subject)})
-          matchedFCs.forEach(itemLink=>{
-            for(const item of this.store.match(namedNode(itemLink.object), namedNode(this.mapConfig.search.props.fcLabel))) {
-              results.push(quadToSimpleQueryResult(item))
-            }
-          })
-        })
-        return results
-      }
-    },
-
-    /**
-     * Calls the spacePrez search endpoint using the query for spacePrez
-     */
-    async fetchSpacePrezData() {
-        return await this.fetchData(`${this.apiBaseUrl}/sparql`, getDatasetFeatureQuery(this.mapConfig.search));
-    },
-
-    /**
-     * Makes a GET request to the specified API endpoint with the provided SPARQL query.
-     * Parses the response with the N3 parser and creates a new N3 store from the parsed data.
-     * @param apiUrl - The URL of the SPARQL endpoint.
-     * @param query - The SPARQL query to execute.
-     */
-    async fetchData(apiUrl:string, query:string) {
-      try {
-        // initialise the state
-        const parser = new Parser();
-        this.loading = true
-        this.success = false
-
-        // make the API call to the SPARQL endpoint
-        const response = await axios.get(apiUrl, { params: { query }})
-
-        // process the response through the N3 parser
-        this.data = parser.parse(response.data)
-
-        // create a new N3 store from the parsed data
-        this.store = new Store(this.data)
-
-        // successfully processed
-        this.success = true
-        this.error = null
-
-      } catch (error:any) {
-
-        // set the error status
-        this.error = error.message
-        this.success = false
-
-      } finally {
-        // always set loading to complete
-        this.loading = false
-      }
-    }
-  }
-})
diff --git a/src/stores/mapSearchStore.d.ts b/src/stores/mapSearchStore.d.ts
deleted file mode 100644
index 6cc68dc..0000000
--- a/src/stores/mapSearchStore.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-/** well known text simplified result object, as returned by mapSearch */
-export type WKTResult = {
-    uri: string
-    link: string
-    wkt: string
-    fcLabel: string
-    label: string
-    id?: string
-}
diff --git a/src/stores/mapSearchStore.ts b/src/stores/mapSearchStore.ts
deleted file mode 100644
index a5a163c..0000000
--- a/src/stores/mapSearchStore.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * This is a pinia store module that provides search functionality for a triple store. It uses the N3.js library for parsing and querying RDF data, and axios for HTTP requests.
- * The searchStore provides a method to get a full tree representation of the datasets and their child feature collections, and a method to get a list of datasets with their titles.
- */
-import { defineStore } from 'pinia'
-import axios from 'axios'
-import { inject } from 'vue';
-import type { WKTResult } from '@/stores/mapSearchStore.d'
-
-import { apiBaseUrlConfigKey } from "@/types";
-
-const linkPrefix = '/object?uri='
-
-/**
- * Main search store for processing the results of a search SPARQL query
- */
-export const mapSearchStore = defineStore({
-  id: 'mapSearchStore',
-
-  /**
-   * The initial store state
-   * @returns {Object}
-   */
-  state: () => {
-    const apiBaseUrl = inject(apiBaseUrlConfigKey) as string;
-
-    //    const config = inject(configKey, defaultConfig)
-    return {
-      data: <WKTResult[]>[],
-      success: false,
-      loading: false,
-      error: null as null | string,
-      apiBaseUrl: apiBaseUrl
-    }
-  },
-
-  /**
-   * Callable actions
-   */
-  actions: {
-
-    /**
-     * Calls the spacePrez search endpoint using a passed in generated query, sets the result WKT in the data object
-     */
-    async searchMap(query:string) {
-        // make the API call to the SPARQL endpoint
-        const url = `${this.apiBaseUrl}/sparql`
-        this.loading = true
-        this.success = false
-
-        try {
-          const response = await axios.get(url,  { headers: {"accept": "application/sparql-results+json"}, params: { query }})
-          this.data = response.data.results.bindings.filter((item:any)=>item.fc_label?.value).map((item:any)=>{
-            return {
-              uri: item.f_uri.value,
-              link: `${linkPrefix}${item.f_uri.value}`,
-              wkt: item.wkt.value,
-              fcLabel: item.fc_label?.value,
-              label: item.f_label.value
-            }
-          })
-          // successfully processed
-          this.success = true
-          this.error = null
-
-        } catch (error:any) {
-          // set the error status
-          this.error = error.message as string
-          this.data = []
-          this.success = false
-
-        } finally {
-          // always set loading to complete
-          this.loading = false
-        }
-
-    }
-
-  }
-})
diff --git a/src/stores/refDataStore.ts b/src/stores/refDataStore.ts
deleted file mode 100644
index f37b862..0000000
--- a/src/stores/refDataStore.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * This is a pinia store module that provides search functionality for a triple store. It uses the N3.js library for parsing and querying RDF data, and axios for HTTP requests.
- * The searchStore provides a method to get a full tree representation of the datasets and their child feature collections, and a method to get a list of datasets with their titles.
- */
-import { defineStore } from 'pinia'
-import axios from 'axios'
-import { inject } from 'vue';
-import { apiBaseUrlConfigKey } from "@/types";
-
-
-/**
- * Factory store function
- */
-export function refDataStore(id:string) {
-  
-  return defineStore(
-  {
-    id,
-
-    /**
-     * The initial store state
-     * @returns {Object}
-     */
-    state: () => {
-      const apiBaseUrl = inject(apiBaseUrlConfigKey) as string;
-
-      //    const config = inject(configKey, defaultConfig)
-      return {
-        data: [] as Array<object>,
-        success: false,
-        loading: false,
-        error: null,
-        apiBaseUrl: apiBaseUrl
-      }
-    },
-
-    /**
-     * Callable actions
-     */
-    actions: {
-
-      /**
-       * Calls the SPARQL endpoint with the predefined query, returns a generalised object array from the json response
-       */
-      async fetch<T>(query:string):Promise<void> {
-          // make the API call to the SPARQL endpoint
-          const url = `${this.apiBaseUrl}/sparql`
-          this.loading = true
-          this.success = false
-
-          try {
-            const response = await axios.get(url,  { headers: {"accept": "application/sparql-results+json"}, params: { query }})
-            this.data = response.data.results.bindings.map((item:any)=>{
-              let result:any = {}
-              Object.keys(item).forEach(key=>{
-                result[key] = item[key].value
-              })
-              return result
-            })
-            // successfully processed
-            this.success = true
-            this.error = null
-
-          } catch (error:any) {
-            // set the error status
-            this.error = error.message
-            this.data = []
-            this.success = false
-
-          } finally {
-            // always set loading to complete
-            this.loading = false
-          }
-
-      }
-
-    }
-  })
-}
-
diff --git a/src/util/helpers.ts b/src/util/helpers.ts
index fd8a137..5b71a3e 100644
--- a/src/util/helpers.ts
+++ b/src/util/helpers.ts
@@ -32,4 +32,23 @@ export function copyToClipboard(text: string) {
 
 export function titleCase(s: string): string {
     return s.charAt(0).toUpperCase() + s.slice(1).toLowerCase();
-}
\ No newline at end of file
+}
+
+/**
+ * Sorts an array of objects alphabetically first, and then by IRI if some elements lack a title
+ * 
+ * @param a 
+ * @param b 
+ * @returns 
+ */
+export const sortByTitle = <T extends {title?: string; iri: string;}>(a: T, b: T): number => {
+    if (a.title && b.title) {
+        return a.title.localeCompare(b.title);
+    } else if (a.title) {
+        return -1;
+    } else if (b.title) {
+        return 1;
+    } else {
+        return a.iri.localeCompare(b.iri);
+    }
+};
\ No newline at end of file
diff --git a/src/views/AltView.vue b/src/views/AltView.vue
deleted file mode 100644
index 1b68cb6..0000000
--- a/src/views/AltView.vue
+++ /dev/null
@@ -1,102 +0,0 @@
-<script lang="ts" setup>
-import { onMounted, computed, inject } from "vue";
-import { RouterLink, useRoute } from "vue-router";
-import { useUiStore } from "@/stores/ui";
-import { useGetRequest } from "@/composables/api";
-import { apiBaseUrlConfigKey } from "@/types";
-
-const mediatypeNames: {[key: string]: string} = {
-    "text/html": "HTML",
-    "application/json": "JSON",
-    "application/ld+json": "JSON-LD",
-    "text/turtle": "Turtle",
-    "application/rdf+xml": "RDF/XML",
-    "text/csv": "CSV",
-    "application/geo+json": "GeoJSON"
-};
-
-const route = useRoute();
-const ui = useUiStore();
-const apiBaseUrl = inject(apiBaseUrlConfigKey) as string;
-
-const { data, profiles, loading, error, doRequest } = useGetRequest();
-
-const defaultToken = computed(() => {
-    const defaultProfile = profiles.value.find(p => p.default);
-    if (defaultProfile === undefined) {
-        throw new TypeError("A default profile must exist.");
-    }
-    return defaultProfile.token;
-});
-
-const orderedProfiles = computed(() => {
-    const includedProfiles = profiles.value.map(prof => prof.token);
-    return Object.values(ui.profiles)
-        .filter(prof => includedProfiles.includes(prof.token))
-        .sort((a, b) => Number(b.token === defaultToken.value) - Number(a.token === defaultToken.value))
-        .sort((a, b) => Number(a.namespace === "http://www.w3.org/ns/dx/conneg/altr-ext#alt-profile") - Number(b.namespace === "http://www.w3.org/ns/dx/conneg/altr-ext#alt-profile"));
-});
-
-onMounted(() => {
-    doRequest(`${apiBaseUrl}${route.path}`);
-    ui.rightNavConfig = { enabled: false };
-});
-</script>
-
-<template>
-    <h1 class="page-title">Alternate Profiles</h1>
-    <table>
-        <tr>
-            <th>Token</th>
-            <th>Name</th>
-            <th>Formats</th>
-            <th>Description</th>
-            <th>Namespace</th>
-        </tr>
-        <tr v-for="profile in orderedProfiles">
-            <td>
-                <RouterLink :to="`${route.path}?_profile=${profile.token}`">
-                    {{ profile.token }}
-                </RouterLink>
-                <span v-if="(profile.token === defaultToken)" class="badge" title="This is the default profile for this endpoint">default</span>
-            </td>
-            <td><RouterLink :to="`/profiles/${profile.token}`">{{ profile.title }}</RouterLink></td>
-            <td>
-                <div v-for="mediatype in profile.mediatypes">
-                    <RouterLink :to="`${route.path}?_profile=${profile.token}&_mediatype=${mediatype}`">
-                        {{ mediatypeNames[mediatype] || mediatype }}
-                    </RouterLink>
-                    <span v-if="(mediatype === profile.defaultMediatype)" class="badge" title="This is the default format for this profile">default</span>
-                </div>
-            </td>
-            <td>{{ profile.description }}</td>
-            <td><a :href="profile.namespace" target="_blank">{{ profile.namespace }}</a></td>
-        </tr>
-    </table>
-</template>
-
-<style lang="scss" scoped>
-@import "@/assets/sass/_variables.scss";
-
-table {
-    border-collapse: collapse;
-
-    & > tr {
-        th, td {
-            padding: 6px;
-        }
-
-        th {
-            text-align: center;
-        }
-
-        &:nth-child(2n) {
-            background-color: var(--tableBg);
-        }
-    }
-}
-
-.badge {
-    margin-left: 4px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/ItemListView.vue b/src/views/ItemListView.vue
index 6ee1a79..53147eb 100644
--- a/src/views/ItemListView.vue
+++ b/src/views/ItemListView.vue
@@ -4,8 +4,8 @@ import { useRoute } from "vue-router";
 import { DataFactory, type Quad_Object, type Quad_Subject } from "n3";
 import { useUiStore } from "@/stores/ui";
 import { useRdfStore } from "@/composables/rdfStore";
-import { useGetRequest } from "@/composables/api";
-import { apiBaseUrlConfigKey, perPageConfigKey, type Breadcrumb, type ListItem, type PrezFlavour, type Profile, type ListItemExtra, type ListItemSortable } from "@/types";
+import { useApiRequest } from "@/composables/api";
+import { apiBaseUrlConfigKey, perPageConfigKey, type Breadcrumb, type PrezFlavour, type Profile, type ListItemExtra, type ListItemSortable } from "@/types";
 import ItemList from "@/components/ItemList.vue";
 import AdvancedSearch from "@/components/search/AdvancedSearch.vue";
 import ProfilesTable from "@/components/ProfilesTable.vue";
@@ -14,7 +14,7 @@ import PaginationComponent from "@/components/PaginationComponent.vue";
 import { getPrezSystemLabel } from "@/util/prezSystemLabelMapping";
 import SortableTabularList from "@/components/SortableTabularList.vue";
 import LoadingMessage from "@/components/LoadingMessage.vue";
-import { ensureProfiles } from "@/util/helpers";
+import { ensureProfiles, sortByTitle } from "@/util/helpers";
 
 const { namedNode } = DataFactory;
 
@@ -22,8 +22,8 @@ const apiBaseUrl = inject(apiBaseUrlConfigKey) as string;
 const defaultPerPage = inject(perPageConfigKey) as number;
 const route = useRoute();
 const ui = useUiStore();
+const { loading, error, apiGetRequest } = useApiRequest();
 const { store, parseIntoStore, qnameToIri } = useRdfStore();
-const { data, profiles, loading, error, doRequest } = useGetRequest();
 
 const DEFAULT_LABEL_PREDICATES = [qnameToIri("rdfs:label")];
 const DEFAULT_DESC_PREDICATES = [qnameToIri("dcterms:description")];
@@ -173,7 +173,7 @@ function getBreadcrumbs(): Breadcrumb[] {
 function getProperties() {
     // find subject & handle top-level vs feature collections & features
     let nodeList: (Quad_Subject | Quad_Object)[] = [];
-    const countQuad = store.value.getQuads(null, namedNode(qnameToIri("prez:count")), null, null)[0];
+    const countQuad = store.value.getQuads(null, namedNode(qnameToIri("prez:count")), null, null)[0]; // isAltView breaks here - prez:count doesn't exist
     count.value = parseInt(countQuad.object.value);
     if (TOP_LEVEL_TYPES.includes(countQuad.subject.value)) {
         nodeList = store.value.getSubjects(namedNode(qnameToIri("a")), countQuad.subject, null);
@@ -227,18 +227,7 @@ function getProperties() {
         items.value.push(c);
     });
 
-    // sort by title first, then by IRI if no title
-    items.value.sort((a, b) => {
-        if (a.title && b.title) {
-            return a.title.localeCompare(b.title);
-        } else if (a.title) {
-            return -1;
-        } else if (b.title) {
-            return 1;
-        } else {
-            return a.iri.localeCompare(b.iri);
-        }
-    });
+    items.value.sort(sortByTitle);
 }
 
 function getIRILocalName(iri: string) {
@@ -294,40 +283,41 @@ onBeforeMount(() => {
     }
 });
 
-onMounted(() => {
+onMounted(async () => {
     loading.value = true;
 
     let fullPath = Object.keys(route.query).length > 0 ? (route.query.per_page ? route.fullPath : route.fullPath + `&per_page=${perPage.value}`) : route.path + `?per_page=${perPage.value}`;
 
-    ensureProfiles().then(() => {
-        doRequest(`${apiBaseUrl}${fullPath}`, () => {
-            defaultProfile.value = ui.profiles[profiles.value.find(p => p.default)!.uri];
+    await ensureProfiles(); // wait for profiles to be set in Pinia
+
+    const { data, profiles } = await apiGetRequest(fullPath);
+    if (data && profiles.length > 0 && !error.value) {
+        defaultProfile.value = ui.profiles[profiles.find(p => p.default)!.uri];
             
-            // if specify mediatype, or profile is not default or alt, redirect to API
-            if ((route.query && route.query._profile) &&
-                (route.query._mediatype || ![defaultProfile.value.token, ALT_PROFILES_TOKEN].includes(route.query._profile as string))) {
-                    window.location.replace(`${apiBaseUrl}${route.path}?_profile=${route.query._profile}${route.query._mediatype ? `&_mediatype=${route.query._mediatype}` : ""}`);
-            }
+        // if specify mediatype, or profile is not default or alt, redirect to API
+        if ((route.query && route.query._profile) &&
+            (route.query._mediatype || ![defaultProfile.value.token, ALT_PROFILES_TOKEN].includes(route.query._profile as string))) {
+                window.location.replace(`${apiBaseUrl}${route.path}?_profile=${route.query._profile}${route.query._mediatype ? `&_mediatype=${route.query._mediatype}` : ""}`);
+        }
 
-            // disable right nav if AltView
-            if (isAltView.value) {
-                ui.rightNavConfig = { enabled: false };
-            } else {
-                ui.rightNavConfig = { enabled: true, profiles: profiles.value, currentUrl: route.path };
-            }
+        // disable right nav if AltView
+        ui.rightNavConfig = {
+            enabled: !isAltView.value,
+            profiles: profiles,
+            currentUrl: route.path
+        };
 
-            parseIntoStore(data.value);
-            getProperties();
+        parseIntoStore(data);
+        getProperties();
 
-            document.title = `${itemType.value.label} | Prez`;
-            ui.breadcrumbs = getBreadcrumbs();
-        });
-    });
+        document.title = `${itemType.value.label} | Prez`;
+        ui.breadcrumbs = getBreadcrumbs();
+    }
 });
 </script>
 
 <template>
-    <ProfilesTable v-if="isAltView" :profiles="profiles" :path="route.path" />
+    <ProfilesTable v-if="isAltView" />
     <template v-else>
         <h1 class="page-title">{{ itemType.label }}</h1>
         <p>A list of <a :href="itemType.uri" target="_blank" rel="noopener noreferrer">{{ itemType.label }}.</a></p>
diff --git a/src/views/PropTableView.vue b/src/views/PropTableView.vue
index 33ceba5..3b1fadb 100644
--- a/src/views/PropTableView.vue
+++ b/src/views/PropTableView.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup>
-import { ref, computed, onMounted, inject, onBeforeMount } from "vue";
+import { ref, onMounted, inject, onBeforeMount } from "vue";
 import { useRoute } from "vue-router";
 import { BlankNode, DataFactory, Quad, Store, Literal, type Quad_Object } from "n3";
 import { useUiStore } from "@/stores/ui";
 import { useRdfStore } from "@/composables/rdfStore";
-import { useGetRequest } from "@/composables/api";
+import { useApiRequest } from "@/composables/api";
+import type { WKTResult } from "@/components/MapClient.d";
 import { apiBaseUrlConfigKey, conceptPerPageConfigKey, enableScoresKey, type ListItem, type AnnotatedQuad, type Breadcrumb, type Concept, type PrezFlavour, type Profile, type ListItemExtra, type ListItemSortable } from "@/types";
 import PropTable from "@/components/proptable/PropTable.vue";
 import ConceptComponent from "@/components/ConceptComponent.vue";
@@ -13,10 +14,9 @@ import ProfilesTable from "@/components/ProfilesTable.vue";
 import ErrorMessage from "@/components/ErrorMessage.vue";
 import { getPrezSystemLabel } from "@/util/prezSystemLabelMapping";
 import MapClient from "@/components/MapClient.vue";
-import type { WKTResult } from "@/stores/mapSearchStore.d";
 import SortableTabularList from "@/components/SortableTabularList.vue";
 import LoadingMessage from "@/components/LoadingMessage.vue";
-import { ensureProfiles, titleCase } from "@/util/helpers";
+import { ensureProfiles, titleCase, sortByTitle } from "@/util/helpers";
 import ScoreWidget from "@/components/scores/ScoreWidget.vue";
 
 const { namedNode } = DataFactory;
@@ -26,11 +26,11 @@ const enableScores = inject(enableScoresKey) as boolean;
 const conceptPerPage = inject(conceptPerPageConfigKey) as number;
 const route = useRoute();
 const ui = useUiStore();
-const { store, prefixes, parseIntoStore, qnameToIri, iriToQname } = useRdfStore();
-const { store: conceptStore, parseIntoStore: conceptParseIntoStore, qnameToIri: conceptQnameToIri, clearStore: conceptClearStore } = useRdfStore();
-const { data, profiles, loading, error, doRequest } = useGetRequest();
-const { data: countData, loading: countLoading, error: countError, doRequest: countDoRequest } = useGetRequest();
-const { data: conceptData, loading: conceptLoading, error: conceptError, doRequest: conceptDoRequest } = useGetRequest();
+const { store, prefixes, parseIntoStore, qnameToIri, iriToQname } = useRdfStore(); // main store
+const { store: conceptStore, parseIntoStore: conceptParseIntoStore, qnameToIri: conceptQnameToIri, clearStore: conceptClearStore } = useRdfStore(); // store for concepts
+const { loading, error, apiGetRequest } = useApiRequest(); // main request
+const { loading: countLoading, error: countError, apiGetRequest: countApiGetRequest } = useApiRequest(); // count concepts for vocab request
+const { loading: conceptLoading, error: conceptError, apiGetRequest: conceptApiGetRequest } = useApiRequest(); // concept related requests
 
 const DEFAULT_LABEL_PREDICATES = [qnameToIri("rdfs:label")];
 const DEFAULT_DESC_PREDICATES = [qnameToIri("dcterms:description")];
@@ -133,7 +133,7 @@ function configByBaseClass(baseClass: string) {
 
 function getProperties() {
     // find subject
-    const subject = isObjectView.value ? namedNode(route.query.uri as string) : store.value.getSubjects(namedNode(qnameToIri("a")), namedNode(item.value.baseClass!), null)[0];
+    const subject = isObjectView.value ? namedNode(route.query.uri as string) : store.value.getSubjects(namedNode(qnameToIri("a")), namedNode(item.value.baseClass!), null)[0]; // isAltView breaks here - subject doesn't exist
     item.value = {
         iri: subject.id,
         types: []
@@ -357,17 +357,7 @@ function getChildren() {
         }, namedNode(item.value.iri), namedNode(childrenPredicate.value), null);
 
         // sort by title, then by IRI
-        children.value.sort((a, b) => {
-            if (a.title && b.title) {
-                return a.title.localeCompare(b.title);
-            } else if (a.title) {
-                return -1;
-            } else if (b.title) {
-                return 1;
-            } else {
-                return a.iri.localeCompare(b.iri);
-            }
-        });
+        children.value.sort(sortByTitle);
     }
 }
 
@@ -425,19 +415,19 @@ function getAllConcepts() {
 
         if (!!c.broader && c.broader !== "") {
             const parent = conceptArray[indexMap[c.broader]];
-            parent.children = [...(parent.children || []), c].sort((a, b) => a.title.localeCompare(b.title));
+            parent.children = [...(parent.children || []), c].sort(sortByTitle);
             parent.childrenCount = parent.children.length;
         }
     });
-    conceptsList.sort((a, b) => a.title.localeCompare(b.title));
+    conceptsList.sort(sortByTitle);
     concepts.value = conceptsList;
 }
 
-function getTopConcepts(page: number = 1) {
+async function getTopConcepts(page: number = 1) {
     conceptClearStore();
-
-    conceptDoRequest(`${apiBaseUrl}${route.path}/top-concepts?page=${page}&per_page=${conceptPerPage}`, () => {
-        conceptParseIntoStore(conceptData.value);
+    const { data: conceptData } = await conceptApiGetRequest(`${route.path}/top-concepts?page=${page}&per_page=${conceptPerPage}`);
+    if (conceptData && !conceptError.value) {
+        conceptParseIntoStore(conceptData);
 
         conceptStore.value.forObjects(object => {
             let c: Concept = {
@@ -462,29 +452,29 @@ function getTopConcepts(page: number = 1) {
             concepts.value.push(c);
         }, namedNode(item.value.iri), namedNode(conceptQnameToIri("skos:hasTopConcept")), null);
 
-        concepts.value.sort((a, b) => a.title.localeCompare(b.title));
-    });
+        concepts.value.sort(sortByTitle);
+    }
 }
 
-function getNarrowers({ iriPath, link, page = 1 }: { iriPath: string, link: string, page: number }) {
-    conceptClearStore();
-
-    conceptDoRequest(`${apiBaseUrl}${link}/narrowers?page=${page}&per_page=${conceptPerPage}`, () => {
-        // find parent to add narrowers to in hierarchy
-        let parent: Concept | undefined;
-        iriPath.split("|").forEach((iri, index) => {
-            if (index === 0) {
-                parent = concepts.value.find(c => c.iri === iri);
-            } else {
-                parent = parent!.children.find(c => c.iri === iri);
-            }
-
-            if (!parent) {
-                // error
-            }
-        });
+async function getNarrowers({ iriPath, link, page = 1 }: { iriPath: string, link: string, page: number }) {
+    // find parent to add narrowers to in hierarchy
+    let parent: Concept | undefined;
+    iriPath.split("|").forEach((iri, index) => {
+        if (index === 0) {
+            parent = concepts.value.find(c => c.iri === iri);
+        } else {
+            parent = parent!.children.find(c => c.iri === iri);
+        }
 
-        conceptParseIntoStore(conceptData.value);
+        if (!parent) {
+            // error
+        }
+    });
+    
+    conceptClearStore();
+    const { data: conceptData } = await conceptApiGetRequest(`${link}/narrowers?page=${page}&per_page=${conceptPerPage}`);
+    if (conceptData && !conceptError.value) {
+        conceptParseIntoStore(conceptData);
 
         conceptStore.value.forObjects(object => {
             let c: Concept = {
@@ -509,8 +499,8 @@ function getNarrowers({ iriPath, link, page = 1 }: { iriPath: string, link: stri
             parent!.children.push(c);
         }, namedNode(parent!.iri), namedNode(conceptQnameToIri("skos:narrower")), null);
 
-        parent!.children.sort((a, b) => a.title.localeCompare(b.title));
-    });
+        parent!.children.sort(sortByTitle);
+    }
 }
 
 function createAnnoQuad(q: Quad, store: Store, labelPredicates: string[]): AnnotatedQuad {
@@ -610,10 +600,24 @@ onBeforeMount(() => {
     }
 });
 
-function getData() {
-    doRequest(`${apiBaseUrl}${hasFewChildren.value ? route.path + "/all" + window.location.search : route.fullPath}`, () => {
+onMounted(async () => {
+    loading.value = true;
+    await ensureProfiles(); // wait for profiles to be set in Pinia
+
+    if (item.value.baseClass === qnameToIri("skos:ConceptScheme")) {
+        const { data: countData } = await countApiGetRequest(`/count?curie=${route.path.split("/").slice(-1)[0]}&inbound=${encodeURIComponent(qnameToIri("skos:inScheme"))}`);
+        if (countData && !countError.value) {
+            if (parseInt(countData.replace('"', "")) <= conceptPerPage) {
+                hasFewChildren.value = true;
+            }
+        }
+    }
+
+    const { data, profiles } = await apiGetRequest(hasFewChildren.value ? `${route.path}/all${window.location.search}` : route.fullPath);
+
+    if (data && profiles.length > 0 && !error.value) {
         // find the current/default profile
-        defaultProfile.value = ui.profiles[profiles.value.find(p => p.default)!.uri];
+        defaultProfile.value = ui.profiles[profiles.find(p => p.default)!.uri];
         
         // if specify mediatype, or profile is not default or alt, redirect to API
         if ((route.query && route.query._profile) &&
@@ -621,46 +625,26 @@ function getData() {
                 window.location.replace(`${apiBaseUrl}${route.path}?_profile=${route.query._profile}${route.query._mediatype ? `&_mediatype=${route.query._mediatype}` : ""}`);
         }
 
-        // disable right nav if AltView
-        if (isAltView.value) {
-            ui.rightNavConfig = { enabled: false };
-        } else {
-            ui.rightNavConfig = { enabled: true, profiles: profiles.value, currentUrl: route.path };
-        }
-
-        parseIntoStore(data.value);
+        ui.rightNavConfig = {
+            enabled: !isAltView.value,
+            profiles: profiles,
+            currentUrl: route.path
+        };
+    
+        parseIntoStore(data);
         getProperties();
         if (!isAltView.value && childrenConfig.value.showChildren) {
             getChildren();
         }
-
+    
         document.title = item.value.title ? `${item.value.title} | Prez` : "Prez";
         ui.breadcrumbs = getBreadcrumbs();
-    });
-}
-
-onMounted(() => {
-    loading.value = true;
-    // wait for profiles to be set in Pinia
-    ensureProfiles().then(() => {
-        console.log("profiles ready")
-
-        if (item.value.baseClass === qnameToIri("skos:ConceptScheme")) {
-            countDoRequest(`${apiBaseUrl}/count?curie=${route.path.split("/").slice(-1)[0]}&inbound=${encodeURIComponent(qnameToIri("skos:inScheme"))}`, () => {
-                if (parseInt(countData.value.replace('"', "")) <= conceptPerPage) {
-                    hasFewChildren.value = true;
-                }
-                getData();
-            });
-        } else {
-            getData();
-        }
-    });
+    }
 });
 </script>
 
 <template>
-    <ProfilesTable v-if="isAltView" :profiles="profiles" :path="route.path" />
+    <ProfilesTable v-if="isAltView" />
     <template v-else>
         <PropTable v-if="properties.length > 0" :item="item" :properties="properties" :blankNodes="blankNodes" :prefixes="prefixes" :hiddenPreds="hiddenPredicates">
             <template #map>
diff --git a/src/views/SearchView.vue b/src/views/SearchView.vue
index fdf68b7..456c50d 100644
--- a/src/views/SearchView.vue
+++ b/src/views/SearchView.vue
@@ -3,10 +3,9 @@ import { onMounted, ref, watch, inject } from "vue";
 import { useRoute } from "vue-router";
 import { DataFactory } from "n3";
 import { useUiStore } from "@/stores/ui";
-import { useGetRequest } from "@/composables/api";
+import { useApiRequest } from "@/composables/api";
 import { useRdfStore } from "@/composables/rdfStore";
-import { apiBaseUrlConfigKey } from "@/types";
-import type { WKTResult } from "@/stores/mapSearchStore.d";
+import type { WKTResult } from "@/components/MapClient.d";
 import AdvancedSearch from "@/components/search/AdvancedSearch.vue";
 import LoadingMessage from "@/components/LoadingMessage.vue";
 import ErrorMessage from "@/components/ErrorMessage.vue";
@@ -27,10 +26,9 @@ interface SearchResult {
     source: string;
 };
 
-const apiBaseUrl = inject(apiBaseUrlConfigKey) as string;
 const route = useRoute();
 const ui = useUiStore();
-const { data, loading, error, doRequest } = useGetRequest();
+const { loading, error, apiGetRequest } = useApiRequest(); // main request
 const { store, parseIntoStore, qnameToIri } = useRdfStore();
 
 const query = ref(route.query as { [key: string]: string });
@@ -38,13 +36,15 @@ const results = ref<SearchResult[]>([]);
 const searchMapRef = ref()
 const geoResults = ref<WKTResult[]>([]);
 
-function getResults() {
+async function getResults() {
     if (route.query && route.query.term) {
         results.value = [];
         geoResults.value = [];
 
-        doRequest(`${apiBaseUrl}${route.fullPath}`, () => {
-            parseIntoStore(data.value);
+        const { data } = await apiGetRequest(route.fullPath);
+        
+        if (data && !error.value) {
+            parseIntoStore(data);
             const labelPredicateIris = LABEL_PREDICATES.map(p => qnameToIri(p));
 
             store.value.forSubjects(subject => {
@@ -81,23 +81,23 @@ function getResults() {
                     });
                 }
             }, namedNode(qnameToIri("a")), namedNode(qnameToIri("prez:SearchResult")), null);
-        });
+        }
     }
 }
 
-watch(() => route.query, (newValue, oldValue) => {
+watch(() => route.query, async (newValue, oldValue) => {
     if (Object.keys(newValue).length > 0 && newValue !== oldValue) {
-        getResults();
+        await getResults();
     }
 }, { deep: true });
 
-onMounted(() => {
+onMounted(async () => {
     ui.rightNavConfig = { enabled: false };
     document.title = "Advanced Search | Prez";
     ui.pageHeading = { name: "Prez", url: "/" };
     ui.breadcrumbs = [{ name: "Advanced Search", url: "/search" }];
     if (Object.keys(route.query).length > 0) {
-        getResults();
+        await getResults();
     }
 });
 </script>