Use phrases in highlighting too
Properly handle incomplete "field:"
Fix case like from:"someone"