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