diff --git a/lib/Service/ContactsAddressBook.php b/lib/Service/ContactsAddressBook.php
index d7f65f4..dc311a6 100644
--- a/lib/Service/ContactsAddressBook.php
+++ b/lib/Service/ContactsAddressBook.php
@@ -80,7 +80,7 @@ public function search($pattern, $searchProperties, $options) {
 			}
 
 			// prevents linking to contacts if UID is set
-			$record['isLocalSystemBook'] = true;
+			$record['isVirtualAddressBook'] = true;
 			$record[self::DAV_PROPERTY_SOURCE] = $this->cardBackend->getURI();
 			$result[] = $record;
 		}
diff --git a/lib/Service/LdapEntryToVcard.php b/lib/Service/LdapEntryToVcard.php
index 05bad08..4c9dc7c 100644
--- a/lib/Service/LdapEntryToVcard.php
+++ b/lib/Service/LdapEntryToVcard.php
@@ -29,6 +29,10 @@ public static function convert(Entry $record, ConfigurationModel $configuration)
 		$mappings = array_merge(self::DEFAULT_MAPPING, $configuration->getAttributeMapping());
 		foreach ($mappings as $vcProperty => $lAttributes) {
 			$propertyName = strtoupper($vcProperty);
+			if ($propertyName === 'UID') {
+				// Ignoring UID mapping as not-relevant and could generate issues in core
+				continue;
+			}
 			$lAttributes = explode(',', (string)$lAttributes);
 			foreach ($lAttributes as $lAttribute) {
 				$lAttribute = trim($lAttribute);
diff --git a/psalm.xml b/psalm.xml
index ff9ad2e..946e799 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -5,7 +5,7 @@
 -->
 <psalm
 	errorLevel="4"
-	phpVersion="8.1"
+	phpVersion="8.2"
 	resolveFromConfigFile="true"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns="https://getpsalm.org/schema/config"