diff --git a/lattice/.gitignore b/lattice/.gitignore
new file mode 100644
index 000000000..a17dd714d
--- /dev/null
+++ b/lattice/.gitignore
@@ -0,0 +1,16 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
diff --git a/lattice/src/App/QueryBuilder/QueryBuilder.tsx b/lattice/src/App/QueryBuilder/QueryBuilder.tsx
index b8a048556..fcad11f97 100644
--- a/lattice/src/App/QueryBuilder/QueryBuilder.tsx
+++ b/lattice/src/App/QueryBuilder/QueryBuilder.tsx
@@ -104,10 +104,13 @@ export const QueryBuilder: FC<QueryBuilderProps> = ({
   useEffect(() => {
     setGroupByFilters(
       queriesList.filter(
-        (q) => q.table === selectedTable.name && q.operation === 'Extract'
+        (q) =>
+          q.table === selectedTable.name &&
+          q.operation === 'Extract' &&
+          q.rowCalls.length > 0
       )
     );
-  }, [selectedTable]);
+  }, [selectedTable, queriesList]);
 
   const getColumnsToShow = (cols?: { name: string; show: boolean }[]) => {
     let columns: string[] = [];