Add highlighting for more fields.