Revert "Revert "index / filter update""

This reverts commit 1c1f987e26874b2be92afb489428b72ec3531073.