diff --git a/pom.xml b/pom.xml
index 9b3a1082..143392a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
       <dependency>
          <groupId>com.kingsrook.qqq</groupId>
          <artifactId>qqq-backend-core</artifactId>
-         <version>0.2.0-20220714.175901-2</version>
+         <version>0.2.0-20220719.154219-3</version>
       </dependency>
 
       <!-- 3rd party deps specifically for this module -->
diff --git a/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSQueryAction.java b/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSQueryAction.java
index ed61115e..e792329c 100644
--- a/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSQueryAction.java
+++ b/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSQueryAction.java
@@ -62,8 +62,8 @@ public class RDBMSQueryAction extends AbstractRDBMSAction implements QueryInterf
    {
       try
       {
-         QTableMetaData table = queryInput.getTable();
-         String tableName = getTableName(table);
+         QTableMetaData table     = queryInput.getTable();
+         String         tableName = getTableName(table);
 
          List<QFieldMetaData> fieldList = new ArrayList<>(table.getFields().values());
          String columns = fieldList.stream()
@@ -72,7 +72,7 @@ public class RDBMSQueryAction extends AbstractRDBMSAction implements QueryInterf
 
          String sql = "SELECT " + columns + " FROM " + tableName;
 
-         QQueryFilter filter = queryInput.getFilter();
+         QQueryFilter       filter = queryInput.getFilter();
          List<Serializable> params = new ArrayList<>();
          if(filter != null && CollectionUtils.nullSafeHasContents(filter.getCriteria()))
          {
@@ -97,9 +97,7 @@ public class RDBMSQueryAction extends AbstractRDBMSAction implements QueryInterf
 
          // todo sql customization - can edit sql and/or param list
 
-         QueryOutput   rs      = new QueryOutput();
-         List<QRecord> records = new ArrayList<>();
-         rs.setRecords(records);
+         QueryOutput queryOutput = new QueryOutput(queryInput);
 
          try(Connection connection = getConnection(queryInput))
          {
@@ -111,7 +109,6 @@ public class RDBMSQueryAction extends AbstractRDBMSAction implements QueryInterf
                   // todo - should refactor this for view etc to use too.
                   // todo - Add display values (String labels for possibleValues, formatted #'s, etc)
                   QRecord record = new QRecord();
-                  records.add(record);
                   record.setTableName(table.getName());
                   LinkedHashMap<String, Serializable> values = new LinkedHashMap<>();
                   record.setValues(values);
@@ -122,12 +119,14 @@ public class RDBMSQueryAction extends AbstractRDBMSAction implements QueryInterf
                      Serializable   value          = getValue(qFieldMetaData, resultSet, i);
                      values.put(qFieldMetaData.getName(), value);
                   }
+
+                  queryOutput.addRecord(record);
                }
 
             }), params);
          }
 
-         return rs;
+         return queryOutput;
       }
       catch(Exception e)
       {
@@ -187,8 +186,8 @@ public class RDBMSQueryAction extends AbstractRDBMSAction implements QueryInterf
 
       for(QFilterOrderBy orderBy : orderBys)
       {
-         QFieldMetaData field = table.getField(orderBy.getFieldName());
-         String column = getColumnName(field);
+         QFieldMetaData field  = table.getField(orderBy.getFieldName());
+         String         column = getColumnName(field);
          clauses.add(column + " " + (orderBy.getIsAscending() ? "ASC" : "DESC"));
       }
       return (String.join(", ", clauses));