[1237] Fix annoyance of double encoded spaces.