Improve api generated urls