improve the urls to work better on different servers