fix some url based issues