Revert "Revert field highlight to text"

This reverts commit c312743b11c6761ef1a56b7abfbfddf61cefd0e8.