Updates to index and multiple filter logic