Unescape internal text more often

To prevent issues with escaped text not matching up with its true form