diff --git a/docs/modules/onecx-product-store-svc/pages/onecx-product-store-svc-extensions.adoc b/docs/modules/onecx-product-store-svc/pages/onecx-product-store-svc-extensions.adoc
index 43edde7..63e3c4e 100644
--- a/docs/modules/onecx-product-store-svc/pages/onecx-product-store-svc-extensions.adoc
+++ b/docs/modules/onecx-product-store-svc/pages/onecx-product-store-svc-extensions.adoc
@@ -11,38 +11,38 @@ h| Version
 | tkit-quarkus-jpa
 
 | https://1000kit.github.io/tkit-quarkus/current/tkit-quarkus/tkit-quarkus-jpa.html[Link]
-| https://github.com/1000kit/tkit-quarkus/blob/2.21.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-jpa.adoc[Link]
-| 2.21.0
+| https://github.com/1000kit/tkit-quarkus/blob/2.22.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-jpa.adoc[Link]
+| 2.22.0
 
 | tkit-quarkus-log-cdi
 
 | https://1000kit.github.io/tkit-quarkus/current/tkit-quarkus/tkit-quarkus-log-cdi.html[Link]
-| https://github.com/1000kit/tkit-quarkus/blob/2.21.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-log-cdi.adoc[Link]
-| 2.21.0
+| https://github.com/1000kit/tkit-quarkus/blob/2.22.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-log-cdi.adoc[Link]
+| 2.22.0
 
 | tkit-quarkus-log-rs
 
 | https://1000kit.github.io/tkit-quarkus/current/tkit-quarkus/tkit-quarkus-log-rs.html[Link]
-| https://github.com/1000kit/tkit-quarkus/blob/2.21.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-log-rs.adoc[Link]
-| 2.21.0
+| https://github.com/1000kit/tkit-quarkus/blob/2.22.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-log-rs.adoc[Link]
+| 2.22.0
 
 | tkit-quarkus-log-json
 
 | https://1000kit.github.io/tkit-quarkus/current/tkit-quarkus/tkit-quarkus-log-json.html[Link]
-| https://github.com/1000kit/tkit-quarkus/blob/2.21.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-log-json.adoc[Link]
-| 2.21.0
+| https://github.com/1000kit/tkit-quarkus/blob/2.22.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-log-json.adoc[Link]
+| 2.22.0
 
 | tkit-quarkus-rest
 
 | https://1000kit.github.io/tkit-quarkus/current/tkit-quarkus/tkit-quarkus-rest.html[Link]
-| https://github.com/1000kit/tkit-quarkus/blob/2.21.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-rest.adoc[Link]
-| 2.21.0
+| https://github.com/1000kit/tkit-quarkus/blob/2.22.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-rest.adoc[Link]
+| 2.22.0
 
 | tkit-quarkus-rest-context
 
 | https://1000kit.github.io/tkit-quarkus/current/tkit-quarkus/tkit-quarkus-rest-context.html[Link]
-| https://github.com/1000kit/tkit-quarkus/blob/2.21.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-rest-context.adoc[Link]
-| 2.21.0
+| https://github.com/1000kit/tkit-quarkus/blob/2.22.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-rest-context.adoc[Link]
+| 2.22.0
 
 | quarkus-arc
 
@@ -114,7 +114,7 @@ h| Version
 
 | https://onecx.github.io/docs/onecx-quarkus/current/onecx-quarkus/onecx-core.html[Link]
 | 
-| 0.16.0
+| 0.17.0
 
 | quarkus-container-image-docker
 
diff --git a/pom.xml b/pom.xml
index fac4342..76e33f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.tkit.onecx</groupId>
         <artifactId>onecx-quarkus3-parent</artifactId>
-        <version>0.46.0</version>
+        <version>0.47.0</version>
     </parent>
 
     <artifactId>onecx-product-store-svc</artifactId>
diff --git a/src/main/java/org/tkit/onecx/product/store/domain/daos/MicrofrontendDAO.java b/src/main/java/org/tkit/onecx/product/store/domain/daos/MicrofrontendDAO.java
index e7c58b0..22f8cbd 100644
--- a/src/main/java/org/tkit/onecx/product/store/domain/daos/MicrofrontendDAO.java
+++ b/src/main/java/org/tkit/onecx/product/store/domain/daos/MicrofrontendDAO.java
@@ -89,7 +89,7 @@ public PageResult<Microfrontend> loadByCriteria(ProductSearchCriteria criteria)
             var cq = cb.createQuery(Microfrontend.class);
             var root = cq.from(Microfrontend.class);
 
-            if (criteria.getProductNames() != null && !criteria.getProductNames().isEmpty()) {
+            if (!criteria.getProductNames().isEmpty()) {
                 cq.where(root.get(Microfrontend_.PRODUCT_NAME).in(criteria.getProductNames()));
             }
             return createPageQuery(cq, Page.of(criteria.getPageNumber(), criteria.getPageSize())).getPageResult();
diff --git a/src/main/java/org/tkit/onecx/product/store/domain/daos/MicroserviceDAO.java b/src/main/java/org/tkit/onecx/product/store/domain/daos/MicroserviceDAO.java
index 93ea357..e79f3ad 100644
--- a/src/main/java/org/tkit/onecx/product/store/domain/daos/MicroserviceDAO.java
+++ b/src/main/java/org/tkit/onecx/product/store/domain/daos/MicroserviceDAO.java
@@ -83,7 +83,7 @@ public PageResult<Microservice> loadByCriteria(ProductSearchCriteria criteria) {
             var cq = cb.createQuery(Microservice.class);
             var root = cq.from(Microservice.class);
 
-            if (criteria.getProductNames() != null && !criteria.getProductNames().isEmpty()) {
+            if (!criteria.getProductNames().isEmpty()) {
                 cq.where(root.get(Microservice_.PRODUCT_NAME).in(criteria.getProductNames()));
             }
             return createPageQuery(cq, Page.of(criteria.getPageNumber(), criteria.getPageSize())).getPageResult();
diff --git a/src/test/java/org/tkit/onecx/product/store/rs/internal/controllers/MicrofrontendsInternalRestControllerTest.java b/src/test/java/org/tkit/onecx/product/store/rs/internal/controllers/MicrofrontendsInternalRestControllerTest.java
index 2c1908c..c53770d 100644
--- a/src/test/java/org/tkit/onecx/product/store/rs/internal/controllers/MicrofrontendsInternalRestControllerTest.java
+++ b/src/test/java/org/tkit/onecx/product/store/rs/internal/controllers/MicrofrontendsInternalRestControllerTest.java
@@ -202,7 +202,7 @@ void createMicrofrontend_shouldReturnBadRequest_whenRunningIntoValidationConstra
         assertThat(response.getDetail()).isEqualTo("createMicrofrontend.createMicrofrontendRequestDTO.appId: must not be null");
         assertThat(invalidParamConstraint.get().getMessage()).isEqualTo("must not be null");
         assertThat(invalidParamConstraint.get().getName()).isEqualTo("createMicrofrontend.createMicrofrontendRequestDTO.appId");
-        assertThat(response.getParams()).isNull();
+        assertThat(response.getParams()).isEmpty();
     }
 
     /**
@@ -524,7 +524,7 @@ void searchMicrofrontends_shouldReturnBadRequest_whenRunningIntoValidationConstr
         assertThat(response.getDetail()).isEqualTo("searchMicrofrontends.microfrontendSearchCriteriaDTO: must not be null");
         assertThat(invalidParamConstraint.get().getMessage()).isEqualTo("must not be null");
         assertThat(invalidParamConstraint.get().getName()).isEqualTo("searchMicrofrontends.microfrontendSearchCriteriaDTO");
-        assertThat(response.getParams()).isNull();
+        assertThat(response.getParams()).isEmpty();
     }
 
     /**
@@ -562,7 +562,7 @@ void updateMicrofrontend_shouldReturnBadRequest_whenRunningIntoValidationConstra
         assertThat(response.getDetail()).isEqualTo("updateMicrofrontend.updateMicrofrontendRequestDTO.appId: must not be null");
         assertThat(invalidParamConstraint.get().getMessage()).isEqualTo("must not be null");
         assertThat(invalidParamConstraint.get().getName()).isEqualTo("updateMicrofrontend.updateMicrofrontendRequestDTO.appId");
-        assertThat(response.getParams()).isNull();
+        assertThat(response.getParams()).isEmpty();
     }
 
     /**
@@ -718,7 +718,7 @@ void updateMicrofrontend_shouldReturnBadRequest_whenRunningIntoUniquenessViolati
         assertThat(paramConstraint.get().getKey()).isEqualTo("constraint");
         assertThat(paramConstraintName.get().getValue()).isEqualTo("microfrontend_module_product_app");
         assertThat(paramConstraintName.get().getKey()).isEqualTo("constraintName");
-        assertThat(response.getInvalidParams()).isNull();
+        assertThat(response.getInvalidParams()).isEmpty();
     }
 
     /**
diff --git a/src/test/java/org/tkit/onecx/product/store/rs/internal/controllers/MicroservicesInternalRestControllerTest.java b/src/test/java/org/tkit/onecx/product/store/rs/internal/controllers/MicroservicesInternalRestControllerTest.java
index 5fa4cf9..d9cba84 100644
--- a/src/test/java/org/tkit/onecx/product/store/rs/internal/controllers/MicroservicesInternalRestControllerTest.java
+++ b/src/test/java/org/tkit/onecx/product/store/rs/internal/controllers/MicroservicesInternalRestControllerTest.java
@@ -161,7 +161,7 @@ void createMicroservice_shouldReturnBadRequest_whenRunningIntoValidationConstrai
         assertThat(response.getDetail()).isEqualTo("createMicroservice.createMicroserviceRequestDTO.appId: must not be null");
         assertThat(invalidParamConstraint.get().getMessage()).isEqualTo("must not be null");
         assertThat(invalidParamConstraint.get().getName()).isEqualTo("createMicroservice.createMicroserviceRequestDTO.appId");
-        assertThat(response.getParams()).isNull();
+        assertThat(response.getParams()).isEmpty();
     }
 
     /**
@@ -453,7 +453,7 @@ void searchMicroservices_shouldReturnBadRequest_whenRunningIntoValidationConstra
         assertThat(response.getDetail()).isEqualTo("searchMicroservice.microserviceSearchCriteriaDTO: must not be null");
         assertThat(invalidParamConstraint.get().getMessage()).isEqualTo("must not be null");
         assertThat(invalidParamConstraint.get().getName()).isEqualTo("searchMicroservice.microserviceSearchCriteriaDTO");
-        assertThat(response.getParams()).isNull();
+        assertThat(response.getParams()).isEmpty();
     }
 
     /**
@@ -570,7 +570,7 @@ void updateMicroservice_shouldReturnBadRequest_whenRunningIntoUniquenessViolatio
         assertThat(paramConstraint.get().getKey()).isEqualTo("constraint");
         assertThat(paramConstraintName.get().getValue()).isEqualTo("microservice_app_id");
         assertThat(paramConstraintName.get().getKey()).isEqualTo("constraintName");
-        assertThat(response.getInvalidParams()).isNull();
+        assertThat(response.getInvalidParams()).isEmpty();
     }
 
     /**