Reverting to a version with a working interface for filtering. Backend
sending to query handler is probably broken.