diff --git a/src/main/java/org/gcube/vremanagement/executor/persistence/orientdb/OrientDBPersistenceConnector.java b/src/main/java/org/gcube/vremanagement/executor/persistence/orientdb/OrientDBPersistenceConnector.java
index 1ad7b56..c146871 100644
--- a/src/main/java/org/gcube/vremanagement/executor/persistence/orientdb/OrientDBPersistenceConnector.java
+++ b/src/main/java/org/gcube/vremanagement/executor/persistence/orientdb/OrientDBPersistenceConnector.java
@@ -259,7 +259,7 @@ public class OrientDBPersistenceConnector extends
 			String type = ScheduledTask.class.getSimpleName();
 
 			OSQLSynchQuery<ODocument> query = new OSQLSynchQuery<ODocument>(
-					String.format("SELECT * FROM %s WHERE %s = :%s", type)
+					String.format("SELECT * FROM %s", type)
 			// TODO filter for task the instance can run
 			);
 
diff --git a/src/main/java/org/gcube/vremanagement/executor/pluginmanager/RunnablePlugin.java b/src/main/java/org/gcube/vremanagement/executor/pluginmanager/RunnablePlugin.java
index a551e4e..cbd3bbb 100644
--- a/src/main/java/org/gcube/vremanagement/executor/pluginmanager/RunnablePlugin.java
+++ b/src/main/java/org/gcube/vremanagement/executor/pluginmanager/RunnablePlugin.java
@@ -104,15 +104,16 @@ public class RunnablePlugin<T extends Plugin<? extends PluginDeclaration>> imple
 				taskUsageRecord.setHost(LOCALHOST);
 			}
 			
-			
-			HashMap<String, Serializable> map = 
-					new HashMap<String, Serializable>();
-			for(String key : inputs.keySet()){
-				if(inputs.get(key) instanceof Serializable){
-					map.put(key, (Serializable) inputs.get(key));
+			if(inputs!=null && inputs.size()>0){
+				HashMap<String, Serializable> map = 
+						new HashMap<String, Serializable>();
+				for(String key : inputs.keySet()){
+					if(inputs.get(key) instanceof Serializable){
+						map.put(key, (Serializable) inputs.get(key));
+					}
 				}
+				taskUsageRecord.setInputParameters(map);
 			}
-			taskUsageRecord.setInputParameters(map);
 			
 			
 			this.plugin.setUUID(uuid);