More urlencoding updates


git-svn-id: http://svn.montala.net/svn/resourcespace@4460 c08608d7-6e46-0410-86ca-f2a6f1370df5
Reinstated Tom's change that was accidentally reverted


git-svn-id: http://svn.montala.net/svn/resourcespace@4461 c08608d7-6e46-0410-86ca-f2a6f1370df5