Added generic query to mongo query converter