diff --git a/src/main/java/org/eclipse/openk/contactbasedata/repository/DetailedContactRepository.java b/src/main/java/org/eclipse/openk/contactbasedata/repository/DetailedContactRepository.java
index b832be8..c88f14d 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/repository/DetailedContactRepository.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/repository/DetailedContactRepository.java
@@ -5,6 +5,7 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.data.repository.query.Param;
 
 import java.util.UUID;
 
@@ -12,9 +13,12 @@
     Page<VwDetailedContact> findAll(Pageable pageable);
 
 
-   @Query( "select dc from VwDetailedContact dc where"
-           + "(COALESCE(?1) is null or COALESCE(?1) is not null AND dc.contactType=?1)"
-           + " and (COALESCE(?2) is null or COALESCE(?2) is not null AND dc.personTypeUuid=?2)"
-           + " and (COALESCE(?3) is null or COALESCE(?3) is not null AND dc.searchfield like %?3%)")
-    Page<VwDetailedContact> findByFilter(String contactType, UUID personType, String searchText, Pageable pageable);
+    @Query( "select dc from VwDetailedContact dc where"
+            + "(COALESCE(:contactType) is null or COALESCE(:contactType) is not null AND dc.contactType=:contactType)"
+            + " and (COALESCE(:personType) is null or COALESCE(:personType) is not null AND dc.personTypeUuid=:personType)"
+            + " and (COALESCE(:searchText) is null or COALESCE(:searchText) is not null AND dc.searchfield like %:searchText%)")
+    Page<VwDetailedContact> findByFilter(@Param("contactType")String contactType,
+                                         @Param("personType") UUID personType,
+                                         @Param("searchText") String searchText,
+                                         Pageable pageable);
 }