SWC-1053: add support for QueryTableResults and supertable cleanup