More double-decode problems fixed
Merged from DEV