url expansion fixes for locations that are paths
merge url expansion fixes for locations that are paths