Rework part about drop of toast indexes