URL issues fix