Fixed URI error with semicolons

Now the bug should be fixed

Properly encoded URIs

Fixed bug related to URI encoding