Revert "index / filter update"

This reverts commit d64e719951f8edef897c4c881647f81982c430d8.