Fixing urlencoding issue with token cookie
tweak