Update schema. Regexes -> matches
Add category suggestions to model