refactor(filter): only work with query objects in filters

related to #CAM-2628, #CAM-2630