Added ability to detect location name