WIP: implementing query filtering  | Fix