Added some more filters to query.