ordering fix

Do away with non-transitive compare function. Instead, reorder
parses later so that cities that are related to the top result
are moved to the top.

Auditors: blackmad