diff --git a/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js b/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js
index 16480b199e..d06cb4000e 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js
+++ b/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js
@@ -90,10 +90,17 @@ const createScreen = table => {
         tableId: table._id,
         type: "table",
       },
-      filter: {
-        _id: `{{ ${makePropSafe("url")}.${makePropSafe("id")} }}`,
-      },
+      filter: [
+        {
+          field: "_id",
+          operator: "equal",
+          type: "string",
+          value: `{{ ${makePropSafe("url")}.${makePropSafe("id")} }}`,
+          valueType: "Binding",
+        },
+      ],
       limit: 1,
+      paginate: false,
     })
 
   const repeater = new Component("@budibase/standard-components/repeater")
diff --git a/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js b/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js
index 37f1a8f04a..7318b3a13d 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js
+++ b/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js
@@ -80,6 +80,7 @@ const createScreen = table => {
         tableId: table._id,
         type: "table",
       },
+      paginate: false,
     })
 
   const spectrumTable = new Component("@budibase/standard-components/table")