fix some url generations