Adding handling for HTML escape characters