Fixing issues in the Mongo Group Scan