fixed up CLI interface. Fixed location search