mongo query parser improvement