Changed criteria to determine which fields to use to display address.