URL encoding issue fixed