Added index filtering #13