added filter on query 1 - 6