Flex reports: clean up of new querying system