MongoQuery refactored - unnecessary implicits removed