Mongo queries rebuilt