Fix bug where field choice persisted into other icon displays