rework on all index views