enabled index filtering by category
code cleanup