small improvements on url fix