Fixed url resolution