diff --git a/pom.xml b/pom.xml
index 2221474d4656b136160a226dca5f08a1d94900fd..7633d613f0cb38c3ddd1c896a4e6ac1da3ae3f2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-dependencies</artifactId>
-		<version>4.3.2</version>
+		<version>4.5.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/user-manager-interface/pom.xml b/user-manager-interface/pom.xml
index 48afc6a7a7ff9a9e2f654168eaa2312047c91e91..028aa511a95b6aef5a68c71980f2ad1b69ed62e7 100644
--- a/user-manager-interface/pom.xml
+++ b/user-manager-interface/pom.xml
@@ -92,13 +92,14 @@
 							<goal>run</goal>
 						</goals>
 						<configuration>
+							<protocVersion>${protobuf.version}</protocVersion>
 							<outputTargets>
 								<outputTarget>
 									<type>java</type>
 								</outputTarget>
 								<outputTarget>
 									<type>grpc-java</type>
-									<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.60.0</pluginArtifact>
+									<pluginArtifact>io.grpc:protoc-gen-grpc-java:${protoc-gen.version}</pluginArtifact>
 								</outputTarget>
 							</outputTargets>
 						</configuration>
diff --git a/user-manager-server/src/main/java/de/ozgcloud/user/UserRepository.java b/user-manager-server/src/main/java/de/ozgcloud/user/UserRepository.java
index 144e7442f231872758457754f968e097f3ec91d6..3dcb5399889bfcacf4a4d8ab1511fa38f64344da 100644
--- a/user-manager-server/src/main/java/de/ozgcloud/user/UserRepository.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/UserRepository.java
@@ -96,7 +96,7 @@ class UserRepository implements PanacheMongoRepository<User> {
 	public Stream<User> findUsersByDeleted(String query, boolean deleted, int limit) {
 		var params = Parameters.with(PARAM_NAME_SEARCH_BY, toRegex(query)).and(PARAM_NAME_DELETED, deleted);
 
-		return find(SEARCH_QUERY + AND_DELETED, params).range(0, limit - 1).stream();
+		return find("(" + SEARCH_QUERY + ")" + AND_DELETED, params).range(0, limit - 1).stream();
 	}
 
 	public Stream<User> findUsersByDeletedAndOrganisationsEinheitId(String query, boolean deleted, String organisationsEinheitId, int limit) {
@@ -104,7 +104,7 @@ class UserRepository implements PanacheMongoRepository<User> {
 				.and(PARAM_NAME_DELETED, deleted)
 				.and(PARAM_NAME_ORGANISATIONS_EINHEIT_ID, organisationsEinheitId);
 
-		return find(SEARCH_QUERY + AND_DELETED + AND_ORGANISATIONS_EINHEIT_ID_IN, params).range(0, limit - 1).stream();
+		return find("(" + SEARCH_QUERY + ")" + AND_DELETED + AND_ORGANISATIONS_EINHEIT_ID_IN, params).range(0, limit - 1).stream();
 	}
 
 	String toRegex(String query) {