Make components#index more performant