Added better short circuiting to prevent mass street file lookups. Minor improvement to geocache city lookup.