#000|Fixing query to remove unecessary AND clause