diff --git a/sormas-api/pom.xml b/sormas-api/pom.xml
index 7495d71617f..5f76c92896c 100644
--- a/sormas-api/pom.xml
+++ b/sormas-api/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>0.5.0</version>
+		<version>0.5.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/sormas-app/pom.xml b/sormas-app/pom.xml
index b3d69690d88..54ccbd96a8e 100644
--- a/sormas-app/pom.xml
+++ b/sormas-app/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>0.5.0</version>
+		<version>0.5.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/sormas-backend/pom.xml b/sormas-backend/pom.xml
index d494b1c350c..7234736f964 100644
--- a/sormas-backend/pom.xml
+++ b/sormas-backend/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sormas-base</artifactId>
         <groupId>de.symeda.sormas</groupId>
-        <version>0.5.0</version>
+        <version>0.5.1</version>
         <relativePath>../sormas-base</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseService.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseService.java
index 3e9b1786def..23f9a6a5f81 100644
--- a/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseService.java
+++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseService.java
@@ -163,6 +163,8 @@ public Predicate createUserFilter(CriteriaBuilder cb, CriteriaQuery cq, From<Cas
 				sampleCaseSubquery.select(sampleRoot.get(Sample.ASSOCIATED_CASE).get(Case.ID));
 				filter = cb.in(casePath.get(Case.ID)).value(sampleCaseSubquery);
 				break;
+			case ADMIN:
+				break;
 				
 			default:
 				throw new IllegalArgumentException(userRole.toString());
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactService.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactService.java
index 074b546e35e..f40d30f1539 100644
--- a/sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactService.java
+++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactService.java
@@ -121,7 +121,11 @@ public List<Contact> getMapContacts(Date fromDate, Date toDate, Disease disease,
 			if (toDate != null) {
 				dateFilter = cb.and(dateFilter, cb.lessThanOrEqualTo(from.get(Contact.REPORT_DATE_TIME), toDate));
 			}
-			filter = cb.and(filter, dateFilter);
+			if (filter != null) {
+				filter = cb.and(filter, dateFilter);
+			} else {
+				filter = dateFilter;
+			}
 		}
 		if (disease != null) {
 			Join<Contact, Case> contactCase = from.join(Contact.CAZE);
@@ -129,7 +133,11 @@ public List<Contact> getMapContacts(Date fromDate, Date toDate, Disease disease,
 			filter = cb.and(filter, diseaseFilter);
 		}	
 		// Only retrieve contacts that are currently under follow-up
-		filter = cb.and(filter, cb.equal(from.get(Contact.FOLLOW_UP_STATUS), FollowUpStatus.FOLLOW_UP));
+		if (filter != null) {
+			filter = cb.and(filter, cb.equal(from.get(Contact.FOLLOW_UP_STATUS), FollowUpStatus.FOLLOW_UP));
+		} else {
+			filter = cb.equal(from.get(Contact.FOLLOW_UP_STATUS), FollowUpStatus.FOLLOW_UP);
+		}
 		cq.where(filter);
 		return em.createQuery(cq).getResultList();
 	}
diff --git a/sormas-base/dependencies/bundles.pom b/sormas-base/dependencies/bundles.pom
index 5ac2b619590..683cf798556 100644
--- a/sormas-base/dependencies/bundles.pom
+++ b/sormas-base/dependencies/bundles.pom
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>sormas-base</artifactId>
         <groupId>de.symeda.sormas</groupId>
-        <version>0.5.0</version>
+        <version>0.5.1</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/sormas-base/dependencies/gf-modules.pom b/sormas-base/dependencies/gf-modules.pom
index 06725195853..a6083b294d0 100644
--- a/sormas-base/dependencies/gf-modules.pom
+++ b/sormas-base/dependencies/gf-modules.pom
@@ -8,7 +8,7 @@
     <parent>
         <artifactId>sormas-base</artifactId>
         <groupId>de.symeda.sormas</groupId>
-        <version>0.5.0</version>
+        <version>0.5.1</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/sormas-base/dependencies/serverlibs.pom b/sormas-base/dependencies/serverlibs.pom
index f636d37559a..85c30673093 100644
--- a/sormas-base/dependencies/serverlibs.pom
+++ b/sormas-base/dependencies/serverlibs.pom
@@ -8,7 +8,7 @@
     <parent>
         <artifactId>sormas-base</artifactId>
         <groupId>de.symeda.sormas</groupId>
-        <version>0.5.0</version>
+        <version>0.5.1</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/sormas-base/pom.xml b/sormas-base/pom.xml
index 246132c3a1f..3230dc12e16 100644
--- a/sormas-base/pom.xml
+++ b/sormas-base/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>de.symeda.sormas</groupId>
 	<artifactId>sormas-base</artifactId>
 	<packaging>pom</packaging>
-	<version>0.5.0</version>
+	<version>0.5.1</version>
 
 	<prerequisites>
 		<maven>3.0</maven>
diff --git a/sormas-ear/pom.xml b/sormas-ear/pom.xml
index 53467880977..bd6a04348df 100644
--- a/sormas-ear/pom.xml
+++ b/sormas-ear/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>0.5.0</version>
+		<version>0.5.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 
diff --git a/sormas-rest/pom.xml b/sormas-rest/pom.xml
index 35f895680e1..f4fe48d7780 100644
--- a/sormas-rest/pom.xml
+++ b/sormas-rest/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>0.5.0</version>
+		<version>0.5.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 
diff --git a/sormas-ui/pom.xml b/sormas-ui/pom.xml
index 1458af79f11..82be8af9f67 100644
--- a/sormas-ui/pom.xml
+++ b/sormas-ui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sormas-base</artifactId>
         <groupId>de.symeda.sormas</groupId>
-        <version>0.5.0</version>
+        <version>0.5.1</version>
         <relativePath>../sormas-base</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/sormas-widgetset/pom.xml b/sormas-widgetset/pom.xml
index 7254f1fb6b7..0ccff887f09 100644
--- a/sormas-widgetset/pom.xml
+++ b/sormas-widgetset/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sormas-base</artifactId>
         <groupId>de.symeda.sormas</groupId>
-        <version>0.5.0</version>
+        <version>0.5.1</version>
         <relativePath>../sormas-base</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>