Categoy Query fixed