Matching code is now more clear, and also more robust against elastic
search highlighting in weird ways (across paragraphs, causing lines
(which are entire paragraphs in our case) matching to break.

Matching should also more accurately match multiple words.