Update providers templates to use new variable. Tighten up location text