Strip location name in URI key
Add directives to set timeouts