Minor fix to ensure tag variables have escape characters removed.