Wayfinder - Fix htmlentities