changed location matching logic to support new county data and changed format of location display text