Updated code to fix bug in location names having spaces or hyphen in between the name.
Merge https://github.com/iMMAP/PerformanceMonitoringApp