Highlight single-word terms
Remove keyerror