diff --git a/publish.sh b/publish.sh
index 353a9a146d0a2aa0321655606d5c482789d977dd..05338d8c9f3ec0bbfad6fc04f9359c96f1e08db3 100755
--- a/publish.sh
+++ b/publish.sh
@@ -25,13 +25,10 @@ fi
 
 if [ $NO_SUDO ]; then
   CAPTAIN="captain"
-  DOCKER="docker"
 elif groups $USER | grep &>/dev/null '\bdocker\b'; then
   CAPTAIN="captain"
-  DOCKER="docker"
 else
   CAPTAIN="sudo captain"
-  DOCKER="sudo docker"
 fi
 
 # Build
diff --git a/src/main/java/eu/hbp/mip/utils/DataUtil.java b/src/main/java/eu/hbp/mip/utils/DataUtil.java
index e2fa3f5fced4324d430a59988e7112bf50dcf353..1bad9d966f8f7e86b2ed3621b5e2140fec7c429b 100644
--- a/src/main/java/eu/hbp/mip/utils/DataUtil.java
+++ b/src/main/java/eu/hbp/mip/utils/DataUtil.java
@@ -25,17 +25,15 @@ public class DataUtil {
     }
 
     @Cacheable("varsdata")
-    public JsonObject getDataFromVariables(List<String> vars, String filters)
+    public JsonObject getDataFromVariables(List<String> vars, String filterSQL)
     {
         JsonObject data = new JsonObject();
+        String filters = "";
 
-        if (filters == null) {
-            filters = "";
-        }
-
-        if (filters.length() > 0) {
-            filters = filters.replaceAll("\\\\'", "''");  // Quick and dirty workaround
-            filters = String.format("AND %s", filters);
+        if (filterSQL != null && filterSQL.length() > 0) {
+            filters = String.format(
+                    " AND %s",
+                    filterSQL.replaceAll("\\\\'", "''"));  // Quick and dirty workaround
         }
 
         for (String var : vars) {