Fix filtering for expanded v unexpanded.

Getting wrong indexer when indexing events.

(Also a load of intellij files)