Expanded civic to general location

Expanded the attack of finding civic information to be finding (general) location information that includes both civic location and geographic location