diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangQueryMapper.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangQueryMapper.java
index 156b33ad16c283c394e08cd87063e4036277ca82..26f9482c8cb51cd4992c2d38fd8904318a41cb20 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangQueryMapper.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangQueryMapper.java
@@ -15,7 +15,7 @@ import de.ozgcloud.vorgang.vorgang.GrpcVorgangQueryExpression;
 import de.ozgcloud.vorgang.vorgang.GrpcVorgangQueryExpression.Builder;
 
 @Mapper(collectionMappingStrategy = CollectionMappingStrategy.ADDER_PREFERRED, nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
-interface OzgCloudVorgangQueryMapper {
+public interface OzgCloudVorgangQueryMapper {
 
 	default GrpcQuery toGrpc(OzgCloudVorgangQuery query) {
 		var queryBuilder = GrpcQuery.newBuilder();
diff --git a/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java b/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java
index ac1567f71d53afe35b08a92504fa590bada70200..bf15fa70790994a26f3886f65701d80af4ab32cb 100644
--- a/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java
+++ b/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java
@@ -31,6 +31,7 @@ import de.ozgcloud.apilib.vorgang.OzgCloudVorgangService;
 import de.ozgcloud.apilib.vorgang.dummy.DummyVorgangService;
 import de.ozgcloud.apilib.vorgang.grpc.GrpcOzgCloudVorgangService;
 import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangMapper;
+import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangQueryMapper;
 import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangStubMapper;
 import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc;
 import de.ozgcloud.vorgang.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
@@ -136,10 +137,10 @@ public class OzgCloudClientAutoConfiguration {
 	@Bean("ozgCloudVorgangService")
 	@ConditionalOnProperty("ozgcloud.vorgang-manager.address")
 	OzgCloudVorgangService grpcOzgCloudVorgangService(VorgangServiceBlockingStub vorgangServiceStub,
-			OzgCloudVorgangMapper mapper,
-			OzgCloudVorgangStubMapper stubMapper, OzgCloudCallContextProvider contextProvider) {
+			OzgCloudVorgangMapper mapper, OzgCloudVorgangStubMapper stubMapper, OzgCloudVorgangQueryMapper queryMapper,
+			OzgCloudCallContextProvider contextProvider) {
 
-		return new GrpcOzgCloudVorgangService(vorgangServiceStub, mapper, stubMapper, contextProvider);
+		return new GrpcOzgCloudVorgangService(vorgangServiceStub, mapper, stubMapper, queryMapper, contextProvider);
 	}
 
 	@Bean
@@ -152,6 +153,11 @@ public class OzgCloudClientAutoConfiguration {
 		return Mappers.getMapper(OzgCloudVorgangStubMapper.class);
 	}
 
+	@Bean
+	OzgCloudVorgangQueryMapper ozgCloudVorgangQueryMapper() {
+		return Mappers.getMapper(OzgCloudVorgangQueryMapper.class);
+	}
+
 	@Bean("ozgCloudVorgangService")
 	@ConditionalOnMissingBean(OzgCloudVorgangService.class)
 	OzgCloudVorgangService dummyOzgCloudVorgangService() {
@@ -204,11 +210,13 @@ public class OzgCloudClientAutoConfiguration {
 		return Mappers.getMapper(OzgCloudFileMapper.class);
 	}
 
-//	@Bean
-//	@ConditionalOnProperty("ozgcloud.user-manager.address")
-//	OzgCloudUserProfileService grpcOzgCloudUserProfileService(@GrpcClient("ozgcloud-user-manager") UserProfileServiceBlockingStub grpcStub,
-//			UserProfileMapper mapper) {
-//		System.out.println("#### building UM-ProfileService");
-//		return new GrpcOzgCloudUserProfileService(grpcStub, mapper);
-//	}
+	// @Bean
+	// @ConditionalOnProperty("ozgcloud.user-manager.address")
+	// OzgCloudUserProfileService
+	// grpcOzgCloudUserProfileService(@GrpcClient("ozgcloud-user-manager")
+	// UserProfileServiceBlockingStub grpcStub,
+	// UserProfileMapper mapper) {
+	// System.out.println("#### building UM-ProfileService");
+	// return new GrpcOzgCloudUserProfileService(grpcStub, mapper);
+	// }
 }