More refactoring of map reduce response