missed an important spot
Merge branch 'criteria-is-in-the-where' into less-broken