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

Inclusion of two new replacements in field mapping for hyphen and question mark, and creation of new tests to properties with hyphen and question mark.