diff --git a/compose/types/record.go b/compose/types/record.go
index b83ffa2f0..5867b83f3 100644
--- a/compose/types/record.go
+++ b/compose/types/record.go
@@ -91,9 +91,9 @@ const (
 	OperationTypeUpdate OperationType = "update"
 	OperationTypeDelete OperationType = "delete"
 
-	recordFieldID          = "id"
-	recordFieldModuleID    = "moduleId"
-	recordFieldNamespaceID = "namespaceId"
+	recordFieldID          = "ID"
+	recordFieldModuleID    = "moduleID"
+	recordFieldNamespaceID = "namespaceID"
 )
 
 // ToFilter wraps RecordFilter with struct that
diff --git a/store/adapters/rdbms/dal/model.go b/store/adapters/rdbms/dal/model.go
index 48e813968..d76e00328 100644
--- a/store/adapters/rdbms/dal/model.go
+++ b/store/adapters/rdbms/dal/model.go
@@ -232,9 +232,9 @@ func (d *model) searchSql(f filter.Filter) *goqu.SelectDataset {
 		}
 
 		// @note why?
-		if !attr.PrimaryKey {
-			continue
-		}
+		// if !attr.PrimaryKey {
+		// 	continue
+		// }
 
 		var attrExpr exp.LiteralExpression
 		attrExpr, err = d.table.AttributeExpression(attr.Ident)