Some fixes to the new index-filter function.