Adjust paths, encode urls
Add enconde url support