diff --git a/api/src/com/cloud/api/commands/ListConditionsCmd.java b/api/src/com/cloud/api/commands/ListConditionsCmd.java
index 57a21b4774b..acda8672106 100644
--- a/api/src/com/cloud/api/commands/ListConditionsCmd.java
+++ b/api/src/com/cloud/api/commands/ListConditionsCmd.java
@@ -45,6 +45,7 @@ public class ListConditionsCmd extends BaseListAccountResourcesCmd {
     @Parameter(name = ApiConstants.ID, type = CommandType.LONG, required = false, description = "ID of the Condition.")
     private Long id;
 
+    @IdentityMapper(entityTableName = "counter")
     @Parameter(name = ApiConstants.COUNTER_ID, type = CommandType.LONG, required = false, description = "Counter-id of the condition.")
     private Long counterId;
 
diff --git a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
index 7c2f5180ddd..53f1021efa3 100644
--- a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
+++ b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
@@ -1038,11 +1038,11 @@ public class AutoScaleManagerImpl<Type> implements AutoScaleService, Manager {
         SearchCriteria<ConditionVO> sc = searchWrapper.buildSearchCriteria();
 
         if (id != null) {
-            sc.addAnd("id", SearchCriteria.Op.EQ, id);
+            sc.setParameters("id", id);
         }
 
         if (counterId != null) {
-            sc.addAnd("counterId", SearchCriteria.Op.EQ, counterId);
+            sc.setParameters("counterId", counterId);
         }
 
         return searchWrapper.search();