Bug fix after some testing of closer integration of EMongoCriteria