Fix some urls to avoid redirections
More readable urls and less redirects