updating map reduce to ensure all fields are filled in prior to android attempting to use them for #1441