restructured remapping feature to handle null data values