Refactored code, added ability to recover if query maps to multiple cities