Fix up URLDecoding as per @zreed's recommendation