Changed Url Encoding to Support Symbols

No idea why it didn't merge properly...but changed url encoding to use Uri instead.