Added default filtering for queries