refactored boolean query to only depend on query