We use now match instead of text

Closes #365