further cleanup of handling state and country pick lists