Replace CONTAINS with the more flexible FILTER

Anything more than that and you should be using define-model-query.