URL logic fixed!