Select the better strings when merging

Uses the already existing heuristics we have for this, but that haven't
been applied that widely yet. Produces better results e.g. for location
names, and fixes empty (but non-null) strings getting through merging.