Fixing HTML decode issues