Major fix to URL management IN PROGRESS