index filter mode 2 fixes