Fix missing localityname (city) field in some situations

Looks like there's a conflict between the locality and localityname fields, in terms of how we assign classes (because Address Field uses non-standard names for xNAL fields).

Here's a simple fix to remove the conflict.