diff --git a/src/components/DesktopView.vue b/src/components/DesktopView.vue
index bf88a461..81b4b9a2 100644
--- a/src/components/DesktopView.vue
+++ b/src/components/DesktopView.vue
@@ -16,6 +16,8 @@ const { loaded: locationsLoaded } = storeToRefs(locationsStore)
 const { singles, clusters } = storeToRefs(useCluster())
 
 const listIsShown = ref(false)
+
+const openSuggestions = ref(false)
 </script>
 
 <template>
@@ -26,8 +28,8 @@ const listIsShown = ref(false)
     class="absolute inset-0 max-w-[368px] transition-[transform,opacity] will-change-transform pointer-events-none bg-gradient-to-r from-space to-space/0"
   />
   <div class="absolute flex flex-col max-w-xs bottom-6 top-6 left-6 h-max pointer-events-none [&>*]:pointer-events-auto">
-    <div class="bg-white shadow-header rounded-2xl" style="mask-image: linear-gradient(white, white);">
-      <InteractionBar />
+    <div class="bg-white shadow-header transition-border-radius" :class="openSuggestions ? 'rounded-t-2xl' : 'rounded-2xl'" style="mask-image: linear-gradient(white, white);">
+      <InteractionBar @open="openSuggestions = $event" />
       <DesktopList :locations="singles" :clusters="clusters" :list-is-shown="listIsShown" />
     </div>
     <Button bg-color="white" class="mt-6" :loading="!locationsLoaded" @click="listIsShown = !listIsShown">
diff --git a/src/components/atoms/SearchBox.vue b/src/components/atoms/SearchBox.vue
index 80f35de7..cace69b5 100644
--- a/src/components/atoms/SearchBox.vue
+++ b/src/components/atoms/SearchBox.vue
@@ -14,7 +14,7 @@ import { computed, ref, useSlots, watchEffect } from 'vue'
 import SearchIcon from '@/components/icons/icon-search.vue'
 import CrossIcon from '@/components/icons/icon-cross.vue'
 import { AutocompleteStatus } from '@/types'
-import type { Suggestion } from '@/types'
+import type { PredictionSubstring, Suggestion } from '@/types'
 
 const props = defineProps({
   roundedFull: {
@@ -94,7 +94,7 @@ function hasSlot(slotName: 'label') {
   return slots[slotName] !== undefined
 }
 
-function sanitizeAndHighlightMatches(str: string, matches: Suggestion['matchedSubstrings']) {
+function sanitizeAndHighlightMatches(str: string, matches: PredictionSubstring[]) {
   // Split into unicode chars because match positions in google.maps.places.AutocompletePrediction["matched_substrings"]
   // are based on unicode chars, as opposed to surrogate pairs of Javascript strings for Unicode chars on astral planes
   // (see https://mathiasbynens.be/notes/javascript-unicode)
@@ -158,6 +158,7 @@ function onListVisibilityChange(isVisible: boolean) {
       >
         <ComboboxInput
           class="w-full border-none placeholder:text-space/60 focus-within:placeholder:text-sky/60 focus:ring-0 outline-none pr-[3.25rem] pl-4"
+          spellcheck="false"
           :class="{
             'text-space': !open,
             'text-ocean': open,
@@ -179,7 +180,6 @@ function onListVisibilityChange(isVisible: boolean) {
       <TransitionRoot leave="transition ease-in duration-100" leave-from="opacity-100" leave-to="opacity-0">
         <ComboboxOptions
           v-element-visibility="onListVisibilityChange" data-combobox-options
-          class="z-40 absolute w-full scroll-space overflow-auto rounded-sm text-base focus:outline-none shadow-lg top-0.5"
           :class="[
             comboboxOptionsClasses,
             {
@@ -187,6 +187,7 @@ function onListVisibilityChange(isVisible: boolean) {
               'bg-space': bgCombobox === 'space',
             },
           ]"
+          class="absolute z-40 overflow-auto text-base rounded-sm shadow-lg scroll-space focus:outline-none"
         >
           <div
             v-if="AutocompleteStatus.WithResults !== status" class="relative px-4 py-2 cursor-default select-none" :class="{
diff --git a/src/components/elements/InteractionBar.vue b/src/components/elements/InteractionBar.vue
index cf195e12..6fc03b85 100644
--- a/src/components/elements/InteractionBar.vue
+++ b/src/components/elements/InteractionBar.vue
@@ -1,19 +1,20 @@
 <script setup lang="ts">
-import { computed } from 'vue'
 import SearchBox from '@/components/atoms/SearchBox.vue'
 import CryptoMapModal from '@/components/elements/CryptoMapModal.vue'
-import { useFilters } from '@/stores/filters'
 import { useAutocomplete } from '@/composables/useAutocomplete'
 import { type Suggestion, SuggestionType } from '@/types'
 import { useMap } from '@/stores/map'
 import { useLocations } from '@/stores/locations'
 
-const { querySearch, dbSuggestions, googleSuggestions } = useAutocomplete()
+const emit = defineEmits({
+  open: (value: boolean) => value,
+})
 
-const suggestions = computed(() => dbSuggestions.value.concat(googleSuggestions.value))
+const { querySearch, suggestions } = useAutocomplete()
 
 function searchBoxOpen(value: boolean) {
   value ? showSearchBoxList() : hideSearchBoxList()
+  emit('open', value)
 }
 
 function hideSearchBoxList() {
@@ -45,12 +46,6 @@ function onSelect(suggestion?: Suggestion) {
     case SuggestionType.Region:
       useMap().goToPlaceId(suggestion.id)
       break
-    case SuggestionType.Category:
-      useFilters().setSelectedCategories([suggestion.id])
-      break
-    case SuggestionType.Currency:
-      useFilters().setSelectedCurrencies([suggestion.id])
-      break
     case SuggestionType.Location:
       useLocations().goToLocation(suggestion.id)
       break
@@ -64,8 +59,8 @@ function onSelect(suggestion?: Suggestion) {
   <header class="relative z-10 flex items-center w-full p-10 py-6 pl-4 pr-6 desktop:p-4 gap-x-2 desktop:gap-x-4">
     <img src="@/assets/logo.svg" :alt="$t('Crypto Map logo')" class="h-[22px]">
     <SearchBox
-      :autocomplete="querySearch" :suggestions="suggestions" class="flex-1" rounded-full
-      combobox-options-classes="w-[322px] mt-12 left-[-48px] max-h-[220px] rounded-t-0" size="sm"
+      :autocomplete="querySearch" :suggestions="suggestions" class="flex-1 w-full" rounded-full
+      combobox-options-classes="w-[320px] desktop:!top-[88px] !rounded-t-0 !rounded-b-2xl" size="sm"
       :placeholder="$t('Search Map')" data-search-box @open="searchBoxOpen" @selected="onSelect"
     />
     <CryptoMapModal />
diff --git a/src/composables/useAutocomplete.ts b/src/composables/useAutocomplete.ts
index d0f7cc21..c7f58fd9 100644
--- a/src/composables/useAutocomplete.ts
+++ b/src/composables/useAutocomplete.ts
@@ -1,9 +1,9 @@
 import { useThrottleFn } from '@vueuse/core'
-import { ref } from 'vue'
-import { queryResults as queryResultsDb } from '@/database'
+import { computed, ref } from 'vue'
 import { detectLanguage } from '@/i18n/i18n-setup'
 import { useMap } from '@/stores/map'
 import { AutocompleteStatus, type Suggestion, SuggestionType } from '@/types'
+import { queryLocations } from '@/database'
 
 enum GoogleAutocompleteFor {
   Location = 'establishment',
@@ -54,10 +54,11 @@ export function useAutocomplete() {
   async function querySearch(query: string) {
     if (!query) {
       dbSuggestions.value = []
+      googleSuggestions.value = []
       return
     }
 
-    dbSuggestions.value = await queryResultsDb(query)
+    dbSuggestions.value = (await queryLocations(query)).map(q => Object.assign(q, { type: SuggestionType.Location }))
     autocompleteGoogle(query, GoogleAutocompleteFor.Regions)
   }
 
@@ -66,6 +67,7 @@ export function useAutocomplete() {
     querySearch,
     dbSuggestions,
     googleSuggestions,
+    suggestions: computed(() => dbSuggestions.value.concat(googleSuggestions.value)),
     autocompleteGoogleLocations: useThrottleFn((query: string) => autocompleteGoogle(query, GoogleAutocompleteFor.Location), 300),
   }
 }
diff --git a/src/database.ts b/src/database.ts
index c9061aaa..d720219d 100644
--- a/src/database.ts
+++ b/src/database.ts
@@ -108,9 +108,9 @@ export async function getLocation(uuid: string): Promise<Location | undefined> {
   return parseLocation(location)
 }
 
-export async function queryResults(userQuery: string) {
-  const url = new URL(`${databaseUrl}/rest/v1/rpc/query_search`)
-  url.searchParams.set('query', userQuery)
-  const suggestions = await fetchDb<Suggestion[]>(url)
+export async function queryLocations(userQuery: string) {
+  const url = new URL(`${databaseUrl}/rest/v1/rpc/search_locations`)
+  url.searchParams.set('p_query', userQuery)
+  const suggestions = await fetchDb<Omit<Suggestion, 'type'>[]>(url)
   return suggestions || []
 }
diff --git a/src/types.ts b/src/types.ts
index 2f4ce79d..7a6e85f8 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -168,31 +168,27 @@ export interface SearchFor {
 
 export enum SuggestionType {
   Location = 'location',
-  Category = 'category',
-  Currency = 'currency',
   GoogleLocation = 'googleLocation',
   Region = 'regions',
 }
 
-export type Suggestion = {
+export interface PredictionSubstring {
+  /**
+   * The length of the substring.
+   */
+  length: number
+  /**
+   * The offset to the substring&#39;s start within the description string.
+   */
+  offset: number
+}
+
+export interface Suggestion {
   label: string
-} & ({
-  id: string // Google Place ID
-  type: SuggestionType.GoogleLocation | SuggestionType.Region
-  matchedSubstrings: google.maps.places.AutocompletePrediction['matched_substrings']
-} | {
-  id: Category
-  type: SuggestionType.Category
-  matchedSubstrings: undefined
-} | {
-  id: Currency
-  type: SuggestionType.Currency
-  matchedSubstrings: undefined
-} | {
-  id: string // Location UUID
-  type: SuggestionType.Location
-  matchedSubstrings: undefined
-})
+  id: string // Google Place ID | Location UUID
+  type: SuggestionType.GoogleLocation | SuggestionType.Region | SuggestionType.Location
+  matchedSubstrings: PredictionSubstring[]
+}
 
 // Others types
 export enum Issue {