Fixing Url Encoding Issue