[BUGFIX] DataHandler: Use the updated field to determine record type