SWC-1133: quick fix for non-paginated query table
Merge pull request #807 from jay-hodgson/SWC-1133

SWC-1133: quick fix for non-paginated query table