Updated the searching to correctly look for states given by their two-letter abbreviation.  Also fixed some of the city searches to include lower-level cities.