Index filtering combo box2

Clean pull-request containing the index filtering functionality.