Fix issue w/ city questions, refine unaffiliated

Supports #255