Rate capping will tighten in in 2021-22, says state government