Pre branch commit
Added toggleable filter to index views
Merged filter branch