updated category query to AND