[3100-highlight] When no highlighted field is available fall back into the field value

[3100-highlight] When no highlighted field is available fall back into the field value #2076