Mongo Query Bugs Fixed