Added ability to choose geography from two columns