Fix and merge ExplorerFilter to develop.