Add feature to disable escaping of surrounding HTML tags