Would need the Index rate (%) field to be based on Revaluation date and not on Lease start date.

The revaluation according to Index rate (%) should be reflected in the Payment schedule, with a recalculation of the instalment amounts starting from revaluation date, by the percentage specified in the index rate type schedule (whichever the book type, Cash basis/IFRS/USGAAP).