Improve REST mode's URLs