Readded some escaping that was lost in a merge