index validation fixes