Added proper handling of cases where a State name is included in a field other than 'state' by a prior provider-specific location enrichment.