Fix #1670 by improving WebMatrix curation

Fixes #1670