fixing URL issues