Feature/mongo 2.6.5 expressions map