Feature/index by category