Fixed issue with querying a index field and a non index field