Fix ordering of url assembly