Model: more on filters (still work in progress)
Model: bug fix