Added missing UrlDecode calls (fixes failing tests)