Removed automatic encoding of HTML substitutions as unnecessary