better querying logic for ands, better understanding of how to remove context