Keep all checkbox related data in Map don't address it via the index #11772

Change-Id: I2c9c68134d9fe958e2881975d1d845dea819a761