diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index 7883bd3aa..fd2fbb62e 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -15399,7 +15399,8 @@ class Interpretation extends Fields
 			$query .= PHP_EOL . $this->_t(3)
 				. "\$categoryId = implode(',', \$categoryId);";
 			$query .= PHP_EOL . $this->_t(3)
-				. "\$query->where('a.category IN (' . \$categoryId . ')');";
+				. "\$query->where('a." . $categoryCodeName
+				. " IN (' . \$categoryId . ')');";
 			$query .= PHP_EOL . $this->_t(2) . "}";
 			$query .= PHP_EOL;
 		}
diff --git a/admin/models/fields.php b/admin/models/fields.php
index ca76072bf..30189fe02 100644
--- a/admin/models/fields.php
+++ b/admin/models/fields.php
@@ -423,7 +423,7 @@ class ComponentbuilderModelFields extends JModelList
 		{
 			ArrayHelper::toInteger($categoryId);
 			$categoryId = implode(',', $categoryId);
-			$query->where('a.category IN (' . $categoryId . ')');
+			$query->where('a.catid IN (' . $categoryId . ')');
 		}
 
 
diff --git a/admin/models/fieldtypes.php b/admin/models/fieldtypes.php
index 07a9056dc..b6b705326 100644
--- a/admin/models/fieldtypes.php
+++ b/admin/models/fieldtypes.php
@@ -216,7 +216,7 @@ class ComponentbuilderModelFieldtypes extends JModelList
 		{
 			ArrayHelper::toInteger($categoryId);
 			$categoryId = implode(',', $categoryId);
-			$query->where('a.category IN (' . $categoryId . ')');
+			$query->where('a.catid IN (' . $categoryId . ')');
 		}