Fixing safe URLs