improve kw highlighting