Filter integrated with models & _index
Merge remote-tracking branch 'origin/simion'
Fixes