Inclusion of two new replacements in field mapping for hyphen and question mark