Update record grouping to handle numbers properly in addition to unicode