add UrlDecode, some polishments