diff --git a/appinfo/info.xml b/appinfo/info.xml
index dbd136721..0d3183b3b 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -37,7 +37,7 @@
     <dependencies>
         <php min-version="8.1" max-version="8.5"/>
         <lib>exif</lib>
-        <nextcloud min-version="32" max-version="34"/>
+        <nextcloud min-version="32" max-version="36"/>
     </dependencies>
     <repair-steps>
 		<post-migration>
diff --git a/appinfo/routes.php b/appinfo/routes.php
index 9993f8d0e..003d3ed27 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -11,7 +11,12 @@
 return [
 	'routes' => [
 		['name' => 'page#index', 'url' => '/', 'verb' => 'GET'],
-		['name' => 'page#indexMyMap', 'url' => '/m/{myMapId}', 'verb' => 'GET'],
+		[
+			'name' => 'page#indexMyMap',
+			'url' => '/m/{myMapId}',
+			'verb' => 'GET',
+			'requirements' => ['myMapId' => '[0-9]+'],
+		],
 		['name' => 'page#do_echo', 'url' => '/echo', 'verb' => 'POST'],
 		['name' => 'page#openGeoLink', 'url' => '/openGeoLink/{url}', 'verb' => 'GET'],
 		['name' => 'public_favorite_page#sharedFavoritesCategory', 'url' => '/s/favorites/{token}', 'verb' => 'GET'],
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 2c38fed4b..ae093faad 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -32,7 +32,7 @@ class PageController extends Controller {
 	public function __construct(
 		string $appName,
 		IRequest $request,
-		private string $userId,
+		private ?string $userId,
 		private IEventDispatcher $eventDispatcher,
 		IAppConfig $appConfig,
 		private IInitialState $initialState,
@@ -68,7 +68,12 @@ public function index(): TemplateResponse {
 	#[NoAdminRequired]
 	#[NoCSRFRequired]
 	public function indexMyMap(int $myMapId, MyMapsService $service): TemplateResponse|RedirectResponse {
-		$map = $service->getMyMap($myMapId, $this->userId);
+		$userId = $this->userId;
+		if ($userId === null) {
+			throw new \LogicException('User must be logged in');
+		}
+
+		$map = $service->getMyMap($myMapId, $userId);
 		if ($map !== null && $map['id'] !== $myMapId) {
 			// Instead of the id of the map containing folder the '.index.maps' file id was passed so redirect
 			// this happens if coming from the files app integration
@@ -80,7 +85,7 @@ public function indexMyMap(int $myMapId, MyMapsService $service): TemplateRespon
 		$this->eventDispatcher->dispatchTyped(new LoadSidebar());
 		$this->eventDispatcher->dispatchTyped(new LoadViewer());
 
-		$params = ['user' => $this->userId];
+		$params = ['user' => $userId];
 		$this->initialState->provideInitialState('photos', $this->appConfig->getValueBool('photos', 'enabled'));
 		$response = new TemplateResponse('maps', 'main', $params);
 
diff --git a/lib/Service/MyMapsService.php b/lib/Service/MyMapsService.php
index b02d9e29d..1028642d9 100644
--- a/lib/Service/MyMapsService.php
+++ b/lib/Service/MyMapsService.php
@@ -150,6 +150,9 @@ public function getAllMyMaps($userId): array {
 	public function getMyMap(int $id, string $userId): ?array {
 		$userFolder = $this->root->getUserFolder($userId);
 		$node = $userFolder->getFirstNodeById($id);
+		if ($node === null) {
+			return null;
+		}
 		if ($node instanceof Folder) {
 			try {
 				$node = $node->get('.index.maps');
diff --git a/src/components/AppNavigationDeviceItem.vue b/src/components/AppNavigationDeviceItem.vue
index 77cde914b..b4d2d518e 100644
--- a/src/components/AppNavigationDeviceItem.vue
+++ b/src/components/AppNavigationDeviceItem.vue
@@ -93,6 +93,8 @@ export default {
 		},
 	},
 
+	emits: ['click', 'toggle-history', 'zoom', 'export', 'add-to-map-device', 'delete', 'color'],
+
 	data() {
 		return {
 		}
diff --git a/src/components/AppNavigationFavoritesItem.vue b/src/components/AppNavigationFavoritesItem.vue
index a3e919d6b..f289cb271 100644
--- a/src/components/AppNavigationFavoritesItem.vue
+++ b/src/components/AppNavigationFavoritesItem.vue
@@ -81,9 +81,9 @@
 						{{ t('maps', 'Zoom to bounds') }}
 					</NcActionButton>
 					<NcActionCheckbox v-if="enabled && nbFavorites && c.enabled && c.name && c.name !== t('maps', 'Personal') && c.isShareable"
-						:checked="c.token && c.token !== ''"
+						:model-value="Boolean(c.token)"
 						:close-after-click="false"
-						@update:checked="$emit('category-share-change', catid, $event)">
+						@update:model-value="$emit('category-share-change', catid, $event)">
 						{{ c.token ? t('maps', 'Delete share link') : t('maps', 'Create share link') }}
 					</NcActionCheckbox>
 					<NcActionButton v-if="enabled && nbFavorites && c.enabled && c.token"
diff --git a/src/components/AppNavigationMyMapItem.vue b/src/components/AppNavigationMyMapItem.vue
index 6476e109e..cfd1aeda4 100644
--- a/src/components/AppNavigationMyMapItem.vue
+++ b/src/components/AppNavigationMyMapItem.vue
@@ -81,6 +81,8 @@ export default {
 		},
 	},
 
+	emits: ['click', 'rename', 'delete', 'share', 'color'],
+
 	data() {
 		return {
 		}
diff --git a/src/components/AppNavigationMyMapsItem.vue b/src/components/AppNavigationMyMapsItem.vue
index 0d65a162c..133d6b8e6 100644
--- a/src/components/AppNavigationMyMapsItem.vue
+++ b/src/components/AppNavigationMyMapsItem.vue
@@ -66,6 +66,8 @@ export default {
 		},
 	},
 
+	emits: ['add', 'my-map-clicked', 'rename', 'delete', 'share', 'color', 'my-maps-clicked'],
+
 	data() {
 		return {
 			open: optionsController.myMapListShow,
diff --git a/src/components/AppNavigationTrackItem.vue b/src/components/AppNavigationTrackItem.vue
index 19e44f275..38d658410 100644
--- a/src/components/AppNavigationTrackItem.vue
+++ b/src/components/AppNavigationTrackItem.vue
@@ -80,7 +80,7 @@
 
 <script>
 import { NcAppNavigationItem, NcActionButton, NcActionLink } from '@nextcloud/vue'
-import { isPublic, getToken } from '../utils/common'
+import { isPublic, getToken } from '../utils/common.js'
 import { generateUrl } from '@nextcloud/router'
 
 export default {
@@ -103,6 +103,8 @@ export default {
 		},
 	},
 
+	emits: ['click', 'zoom', 'elevation', 'add-to-map-track', 'color'],
+
 	data() {
 		return {
 		}
diff --git a/src/components/FavoriteEditionForm.vue b/src/components/FavoriteEditionForm.vue
index f93479342..604775b3e 100644
--- a/src/components/FavoriteEditionForm.vue
+++ b/src/components/FavoriteEditionForm.vue
@@ -10,7 +10,7 @@
 			<span class="icon icon-category-organization" />
 			<NcSelect v-if="favorite.isUpdateable"
 				ref="select"
-				v-model="selectedCategory"
+				:model-value="selectedCategory"
 				class="category-select"
 				label="label"
 				track-by="multiselectKey"
@@ -21,12 +21,12 @@
 				:clear-on-select="false"
 				:preserve-search="false"
 				:placeholder="categoryPH"
-				inputLabel="label"
+				:aria-label-combobox="categoryPH"
 				:options="formattedCategories"
 				:user-select="false"
-				@input="onCategorySelected"
+				@update:model-value="onCategorySelected"
 				@search="onSearchChange">
-				<template #singleLabel="{ option }">
+				<template #selected-option="option">
 					<div class="single-label">
 						{{ option ? option.catid : '' }}
 					</div>
@@ -169,6 +169,7 @@ export default {
 			}
 		},
 		onCategorySelected(option) {
+			this.selectedCategory = option
 			this.category = option ? option.catid : ''
 		},
 		onOkClick() {
diff --git a/src/components/Map.vue b/src/components/Map.vue
index 2476275ae..897d7c880 100644
--- a/src/components/Map.vue
+++ b/src/components/Map.vue
@@ -85,7 +85,8 @@
 				<PlaceContactPopup v-if="placingContact"
 					:map="map"
 					:lat-lng="placingContactLatLng"
-					@contact-placed="onContactPlaced" />
+					@contact-placed="onContactPlaced"
+					@close="onContactPopupClosed" />
 
 				<TracksLayer
 					v-if="tracksEnabled"
@@ -370,7 +371,7 @@ export default {
 
 			const thereWasAPopup = this.map.contextmenu._visible
 				|| this.placingContact
-				|| (this.map._popup !== undefined && this.map._popup !== null)
+				|| this.map._popup?.isOpen()
 				|| this.leftClickSearching
 
 			const hadSpider = this.$refs.favoritesLayer?.spiderfied
@@ -415,9 +416,13 @@ export default {
 			this.leftClickSearchLatLng = L.latLng(lat, lng)
 			this.leftClickSearching = true
 		},
-		onAddContactAddress(obj) {
+		async onAddContactAddress(obj) {
+			const latLng = L.latLng(obj.latLng.lat, obj.latLng.lng)
 			this.leftClickSearching = false
-			this.placingContactLatLng = L.latLng(obj.latLng.lat, obj.latLng.lng)
+			this.placingContact = false
+			this.map.closePopup()
+			await this.$nextTick()
+			this.placingContactLatLng = latLng
 			this.placingContact = true
 		},
 		initLocControl(map) {
@@ -633,6 +638,9 @@ export default {
 			this.placingContactLatLng = L.latLng(e.latlng.lat, e.latlng.lng)
 			this.placingContact = true
 		},
+		onContactPopupClosed() {
+			this.placingContact = false
+		},
 		onContactPlaced(e) {
 			this.placingContact = false
 			this.$emit('contact-placed', e)
diff --git a/src/components/MapsNavigation.vue b/src/components/MapsNavigation.vue
index 39558e364..784174ce1 100644
--- a/src/components/MapsNavigation.vue
+++ b/src/components/MapsNavigation.vue
@@ -9,20 +9,19 @@
 			<NcAppNavigationSettings>
 				<div class="maps-settings">
 					<NcCheckboxRadioSwitch
-						:checked="optionValues.trackMe === 'true'"
-						@update:checked="onTrackMeChange">
+						:model-value="optionValues.trackMe === 'true'"
+						@update:model-value="onTrackMeChange">
 						{{ window.t('maps', 'Track my position') }}
 					</NcCheckboxRadioSwitch>
 					
-					<NcCheckboxRadioSwitch
-						:checked="false"
-						@update:checked="onGeoLinkChange">
-						{{ window.t('maps', 'Open geo links') }}
-					</NcCheckboxRadioSwitch>
+					<NcButton
+						wide
+						:text="window.t('maps', 'Register Maps to open geo links')"
+						@click="$emit('register-geo-link')" />
 					
 					<NcCheckboxRadioSwitch
-						:checked="optionValues.displaySlider === 'true'"
-						@update:checked="onDisplaySliderChange">
+						:model-value="optionValues.displaySlider === 'true'"
+						@update:model-value="onDisplaySliderChange">
 						{{ window.t('maps', 'Display time filter slider') }}
 					</NcCheckboxRadioSwitch>
 					
@@ -44,7 +43,7 @@
 </template>
 
 <script>
-import { NcAppNavigation, NcAppNavigationSettings, NcCheckboxRadioSwitch } from '@nextcloud/vue'
+import { NcAppNavigation, NcAppNavigationSettings, NcButton, NcCheckboxRadioSwitch } from '@nextcloud/vue'
 import optionsController from '../optionsController.js'
 
 // Native Vue 3 Click-Outside directive
@@ -68,9 +67,10 @@ export default {
 	components: {
 		NcAppNavigation,
 		NcAppNavigationSettings,
+		NcButton,
 		NcCheckboxRadioSwitch,
 	},
-	
+
 	directives: {
 		clickOutside,
 	},
@@ -82,6 +82,12 @@ export default {
 		},
 	},
 	
+	emits: [
+		'toggle-trackme',
+		'register-geo-link',
+		'toggle-slider',
+	],
+
 	data() {
 		return {
 			optionValues: optionsController.optionValues,
@@ -102,9 +108,6 @@ export default {
 			optionsController.saveOptionValues({ trackMe: checked ? 'true' : 'false' })
 			this.$emit('toggle-trackme', checked)
 		},
-		onGeoLinkChange(checked) {
-			this.$emit('toggle-geo-link', checked)
-		},
 		onDisplaySliderChange(checked) {
 			this.optionValues.displaySlider = checked ? 'true' : 'false'
 			optionsController.saveOptionValues({ displaySlider: checked ? 'true' : 'false' })
@@ -158,4 +161,4 @@ export default {
 	z-index: 100000;
 	border-radius: var(--border-radius-pill);
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/Sidebar/PhotoSuggestionsSidebarTab.vue b/src/components/Sidebar/PhotoSuggestionsSidebarTab.vue
index d35d42d6c..fe03fb109 100644
--- a/src/components/Sidebar/PhotoSuggestionsSidebarTab.vue
+++ b/src/components/Sidebar/PhotoSuggestionsSidebarTab.vue
@@ -105,8 +105,8 @@
 		<NcAppNavigationSettings class="footer">
 			{{ t('maps', 'Photos default timezone:') }}
 			<NcTimezonePicker
-				:value="photoSuggestionsTimezone"
-				@input="$emit('change-timezone', $event)" />
+				:model-value="photoSuggestionsTimezone"
+				@update:model-value="$emit('change-timezone', $event)" />
 			{{ t('maps', 'Location sources:') }}
 			<NcAppNavigationItem
 				:icon="'icon-road'"
diff --git a/src/components/map/ClickSearchPopup.vue b/src/components/map/ClickSearchPopup.vue
index 8674e783e..daf3bb1a5 100644
--- a/src/components/map/ClickSearchPopup.vue
+++ b/src/components/map/ClickSearchPopup.vue
@@ -8,18 +8,18 @@
 		<textarea v-else
 			id="clickSearchAddress"
 			v-model="formattedAddress" />
-		<button v-if="favoriteIsCreatable" class="search-add-favorite" @click="onAddFavorite">
+		<button v-if="favoriteIsCreatable" class="search-add-favorite" @click.stop="onAddFavorite">
 			<span class="icon-favorite" />
 			{{ t('maps', 'Add to favorites') }}
 		</button>
-		<button v-if="contactIsCreatable" class="search-place-contact" @click="onPlaceContact">
+		<button v-if="contactIsCreatable" class="search-place-contact" @click.stop="onPlaceContact">
 			<span class="icon-user" />
 			{{ t('maps', 'Add contact address') }}
 		</button>
 		<button v-for="action in mapActions"
 			:key="action.label"
 			:icon="action.icon"
-			@click="actionCallback(action)">
+			@click.stop="actionCallback(action)">
 			<span :class="{ [action.icon]: true }" />
 			<span>{{ action.label }}</span>
 		</button>
@@ -61,8 +61,10 @@ export default {
 			address: null,
 			formattedAddress: '',
 			mapActions: window.OCA && window.OCA.Maps ? window.OCA.Maps.mapActions : [],
-			icon: L.icon({
-				iconUrl: 'noIcon',
+			icon: L.divIcon({
+				className: '',
+				html: '',
+				iconSize: [0, 0],
 			}),
 		}
 	},
@@ -176,4 +178,4 @@ span.icon {
 	width: 100%;
 	height: 75px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/map/PlaceContactPopup.vue b/src/components/map/PlaceContactPopup.vue
index 5d459388f..7e67b0c15 100644
--- a/src/components/map/PlaceContactPopup.vue
+++ b/src/components/map/PlaceContactPopup.vue
@@ -19,12 +19,13 @@
 				ref="userMultiselect"
 				v-model="selectedContact"
 				class="contact-input"
-				track-by="URI"
-				inputLabel="FN"
+				label="FN"
+				:get-option-key="getContactKey"
+				:aria-label-combobox="t('maps', 'Choose a contact')"
 				:placeholder="t('maps', 'Choose a contact')"
+				:loading="contactsLoading"
 				:options="contactData"
-				:internal-search="true"
-				@search="asyncSearchContacts">
+				@open="loadContacts">
 				<template #option="option">
 					<Avatar
 						class="contact-avatar"
@@ -54,7 +55,7 @@
 		<button class="submit-place-contact"
 			:disabled="!selectedContact"
 			:class="{ loading: searchingEditedAddress }"
-			@click="onValidate">
+			@click.stop="onValidate">
 			<span class="icon-add" />
 			{{ t('maps', 'Add address to contact') }}
 		</button>
@@ -62,6 +63,7 @@
 </template>
 
 <script>
+import accountIconUrl from '@mdi/svg/svg/account.svg'
 import L from 'leaflet'
 import { generateUrl } from '@nextcloud/router'
 import { getCurrentUser } from '@nextcloud/auth'
@@ -90,9 +92,13 @@ export default {
 		},
 	},
 
+	emits: ['contact-placed', 'close'],
+
 	data() {
 		return {
 			contactData: [],
+			contactsLoaded: false,
+			contactsLoading: false,
 			addressLoading: false,
 			addressEdited: false,
 			searchingEditedAddress: false,
@@ -109,7 +115,7 @@ export default {
 				? this.getContactAvatar(this.selectedContact)
 					? this.getContactAvatar(this.selectedContact)
 					: generateUrl('/apps/maps/contacts-avatar?name=' + encodeURIComponent(this.selectedContact.FN))
-				: generateUrl('/svg/core/actions/user?color=000000')
+				: accountIconUrl
 		},
 		markerIcon() {
 			return L.icon({
@@ -154,7 +160,8 @@ export default {
 		this.marker = L.marker(this.latLng, { icon: this.markerIcon }).addTo(this.map)
 		
 		// 2. Bind THIS component's HTML to the popup natively
-		this.marker.bindPopup(this.$el, { closeButton: false })
+		this.marker.bindPopup(this.$el, { closeButton: true })
+		this.marker.on('popupclose', this.onPopupClose)
 		
 		this.marker.openPopup()
 	},
@@ -162,26 +169,37 @@ export default {
 	beforeUnmount() {
 		// 3. Clean up native marker on destroy
 		if (this.marker && this.map) {
+			this.marker.off('popupclose', this.onPopupClose)
 			this.map.removeLayer(this.marker)
 		}
 	},
 
 	methods: {
-		asyncSearchContacts(query) {
-			if (query === '') {
-				this.contactData = []
+		getContactKey(contact) {
+			return contact.URI
+		},
+		async loadContacts() {
+			if (this.contactsLoaded || this.contactsLoading) {
 				return
 			}
-			searchContacts(query).then((response) => {
+			this.contactsLoading = true
+			try {
+				const response = await searchContacts()
 				this.contactData = response.data.filter((c) => { return !c.READONLY }).map((c) => {
 					return {
 						...c,
 						AVATAR_URL: this.getContactAvatar(c),
 					}
 				})
-			}).catch((error) => {
+				this.contactsLoaded = true
+			} catch (error) {
 				console.error(error)
-			})
+			} finally {
+				this.contactsLoading = false
+			}
+		},
+		onPopupClose() {
+			this.$emit('close')
 		},
 		getContactAvatar(contact) {
 			if (contact.HAS_PHOTO && contact.HAS_PHOTO2) {
@@ -295,4 +313,4 @@ span.icon {
 	height: 75px;
 	resize: block;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/map/PoiMarker.vue b/src/components/map/PoiMarker.vue
index c85e90d4d..07ba70916 100644
--- a/src/components/map/PoiMarker.vue
+++ b/src/components/map/PoiMarker.vue
@@ -6,11 +6,11 @@
 		</div>
 		<span class="location-city">{{ desc }}</span>
 		
-		<button class="search-add-favorite" @click="onAddFavorite">
+		<button class="search-add-favorite" @click.stop="onAddFavorite">
 			<span class="icon-favorite" />
 			{{ t('maps', 'Add to favorites') }}
 		</button>
-		<button class="search-place-contact" @click="onAddContact">
+		<button class="search-place-contact" @click.stop="onAddContact">
 			<span class="icon-user" />
 			{{ t('maps', 'Add contact address') }}
 		</button>
@@ -31,6 +31,7 @@ export default {
 		poi: { type: Object, required: true },
 		map: { type: Object, required: true },
 	},
+	emits: ['add-favorite', 'place-contact'],
 	data() {
 		return { 
 			recentImagePath: imagePath('maps', 'recent.svg'),
@@ -163,8 +164,31 @@ export default {
 			this.map.removeLayer(this.marker);
 		}
 	},
-	methods: { 
-
-	 }
+	methods: {
+		onAddFavorite() {
+			if (this.map) this.map.closePopup()
+			this.$emit('add-favorite', {
+				...this.poi,
+				latLng: {
+					lat: this.poi.lat,
+					lng: this.poi.lon,
+				},
+				name: this.header,
+				formattedAddress: formatAddress(this.poi.address),
+			})
+		},
+		onAddContact() {
+			if (this.map) this.map.closePopup()
+			this.$emit('place-contact', {
+				...this.poi,
+				latLng: {
+					lat: this.poi.lat,
+					lng: this.poi.lon,
+				},
+				name: this.header,
+				formattedAddress: formatAddress(this.poi.address),
+			})
+		},
+	},
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/components/map/SearchField.vue b/src/components/map/SearchField.vue
index 7e51b3dd3..dd3584538 100644
--- a/src/components/map/SearchField.vue
+++ b/src/components/map/SearchField.vue
@@ -1,26 +1,19 @@
 <template>
 	<NcSelect
 		ref="select"
-		inputLabel="label"
+		:aria-label-combobox="placeholder"
 		class="search-select"
 		label="label"
-		track-by="multiselectKey"
-		:value="mySelectedOption"
-		:auto-limit="false"
+		:get-option-key="getOptionKey"
+		:model-value="mySelectedOption"
 		:limit="8"
-		:options-limit="8"
-		:max-height="8 * 45"
-		:close-on-select="false"
-		:clear-on-select="false"
-		:preserve-search="true"
+		keep-open
+		:clear-search-on-select="false"
 		:placeholder="placeholder"
 		:loading="searching || loading"
 		:options="filteredOptions"
-		:user-select="false"
-		:internal-search="false"
-		@input="onOptionSelected"
-		@update:value="onUpdateValue"
-		@change="onChange"
+		:filterable="false"
+		@update:model-value="onOptionSelected"
 		@search="onSearchChange">
 		<template #option="option">
 			<span :class="'option-icon ' + option.icon" />
@@ -28,12 +21,12 @@
 				{{ option.label }}
 			</span>
 		</template>
-		<template #singleLabel="option">
+		<template #selected-option="option">
 			<div class="single-label">
 				{{ option.value || option.label }}
 			</div>
 		</template>
-		<template #noOptions>
+		<template #no-options>
 			{{ t('maps', 'No suggestions') }}
 		</template>
 	</NcSelect>
@@ -91,18 +84,10 @@ export default {
 				return part.replace(/\S/g, (char) => { return accented[char.toUpperCase()] || char })
 			})
 			const regex = new RegExp(queryParts.join('|'), 'i')
-			return this.formattedOptions.filter((option) => {
+			return this.options.filter((option) => {
 				return regex.test(option.label || option.value)
 			})
 		},
-		formattedOptions() {
-			return this.options.map((o) => {
-				return {
-					...o,
-					multiselectKey: o.id + o.type,
-				}
-			})
-		},
 		options() {
 			if (this.currentCoordinateOption && this.currentSearchQueryOption) {
 				return [this.currentCoordinateOption, this.currentSearchQueryOption, ...this.allData]
@@ -135,6 +120,9 @@ export default {
 	},
 
 	methods: {
+		getOptionKey(option) {
+			return `${option.id}${option.type}`
+		},
 		focus() {
 			const input = this.$refs.select.$el.querySelector('input')
 			input.focus()
@@ -145,19 +133,17 @@ export default {
 			}
 			*/
 		},
-		onOptionSelected(option, id) {
+		onOptionSelected(option) {
 			if (option?.type === 'query') {
+				this.mySelectedOption = null
 				this.searchOsm(option.value)
-			} else {
-				if (option) {
-					this.$emit('validate', option)
-					this.mySelectedOption = option
-				}
+				return
+			}
+
+			this.mySelectedOption = option
+			if (option) {
+				this.$emit('validate', option)
 			}
-		},
-		onUpdateValue(e) {
-		},
-		onChange(e) {
 		},
 		onSearchChange(query) {
 			this.query = query
@@ -202,7 +188,6 @@ export default {
 			}
 		},
 		searchOsm(query) {
-			this.mySelectedOption = this.currentSearchQueryOption
 			this.currentSearchQueryOption = null
 			this.searching = true
 			network.searchAddress(query, 5).then((response) => {
diff --git a/src/main.js b/src/main.js
index cf095ba0a..6a247779e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -26,7 +26,6 @@ import '../css/style.scss'
 
 import optionsController from './optionsController.js'
 import { emit } from '@nextcloud/event-bus'
-import { generateUrl } from '@nextcloud/router'
 
 import L from 'leaflet'
 import 'lrm-graphhopper'
@@ -77,10 +76,6 @@ if (!window.OCA.Files.Sidebar) {
     }, window.OCA.Files)
 }
 
-if (window.navigator.registerProtocolHandler) {
-    window.navigator.registerProtocolHandler('geo', generateUrl('/apps/maps/openGeoLink/') + '%s', 'Nextcloud Maps')
-}
-
 function main() {
     const app = createApp(App);
     
@@ -106,4 +101,4 @@ function main() {
 
 document.addEventListener('DOMContentLoaded', () => {
     optionsController.restoreOptions(main)
-})
\ No newline at end of file
+})
diff --git a/src/network.js b/src/network.js
index df393934e..f19406bf2 100644
--- a/src/network.js
+++ b/src/network.js
@@ -53,8 +53,8 @@ export function searchContacts(query = '', myMapId = null) {
 	const req = {
 		params: {
 			myMapId,
+			query,
 		},
-		query,
 	}
 	const url = generateUrl('/apps/maps/contacts-search')
 	return axios.get(url, req)
diff --git a/src/views/App.vue b/src/views/App.vue
index 09450b67e..61848f982 100644
--- a/src/views/App.vue
+++ b/src/views/App.vue
@@ -7,7 +7,7 @@
 		<MapsNavigation
 			@toggle-trackme="onToggleTrackme"
 			@toggle-slider="onToggleSlider"
-			@toggle-geo-link="onToggleGeoLink">
+			@register-geo-link="onRegisterGeoLink">
 			<template #items>
 				<AppNavigationFavoritesItem
 					:enabled="favoritesEnabled"
@@ -747,15 +747,18 @@ export default {
 				this.stopTrackLoop()
 			}
 		},
-		onToggleGeoLink(enabled) {
-			if (enabled) {
-				if (window.navigator.registerProtocolHandler) {
-					window.navigator.registerProtocolHandler('geo', generateUrl('/apps/maps/openGeoLink/') + '%s', 'Nextcloud Maps')
-				}
-			} else {
-				if (window.navigator.unregisterProtocolHandler) {
-					window.navigator.unregisterProtocolHandler('geo', generateUrl('/apps/maps/openGeoLink/') + '%s')
-				}
+		onRegisterGeoLink() {
+			if (!window.navigator.registerProtocolHandler) {
+				showError(t('maps', 'Your browser does not support registering Maps to open geo links'))
+				return
+			}
+
+			try {
+				window.navigator.registerProtocolHandler('geo', generateUrl('/apps/maps/openGeoLink/') + '%s')
+				showSuccess(t('maps', 'Registration requested. Confirm it in your browser.'))
+			} catch (error) {
+				console.error(error)
+				showError(t('maps', 'Failed to register Maps to open geo links'))
 			}
 		},
 		onToggleSlider(enabled) {
diff --git a/tests/Unit/Controller/PageControllerTest.php b/tests/Unit/Controller/PageControllerTest.php
index f440b52e3..bd9dabfeb 100644
--- a/tests/Unit/Controller/PageControllerTest.php
+++ b/tests/Unit/Controller/PageControllerTest.php
@@ -53,6 +53,20 @@ public function testIndex(): void {
 		$this->assertTrue($result instanceof TemplateResponse);
 	}
 
+	public function testCanBeConstructedWithoutAuthenticatedUser(): void {
+		$controller = new PageController(
+			'maps',
+			$this->createMock(IRequest::class),
+			null,
+			$this->eventDispatcher,
+			$this->appConfig,
+			$this->initialState,
+			$this->urlGenerator,
+		);
+
+		$this->assertInstanceOf(PageController::class, $controller);
+	}
+
 	public function testOpenGeoLink(): void {
 		$result = $this->controller->openGeoLink('geo:1.1,2.2');
 
diff --git a/tests/Unit/Service/MyMapsServiceTest.php b/tests/Unit/Service/MyMapsServiceTest.php
new file mode 100644
index 000000000..3a97a9160
--- /dev/null
+++ b/tests/Unit/Service/MyMapsServiceTest.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 DeBaschdi
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Maps\Service;
+
+use OCP\Files\Folder;
+use OCP\Files\IRootFolder;
+use PHPUnit\Framework\TestCase;
+
+class MyMapsServiceTest extends TestCase {
+	public function testGetMyMapReturnsNullWhenNodeDoesNotExist(): void {
+		$root = $this->createMock(IRootFolder::class);
+		$userFolder = $this->createMock(Folder::class);
+
+		$root->expects(self::once())
+			->method('getUserFolder')
+			->with('john')
+			->willReturn($userFolder);
+		$userFolder->expects(self::once())
+			->method('getFirstNodeById')
+			->with(42)
+			->willReturn(null);
+
+		$service = new MyMapsService($root);
+
+		self::assertNull($service->getMyMap(42, 'john'));
+	}
+}