Updated regexes for apostrophe HTML escaping, more concise suffix wildcard