NXP-4760: follow changes on widget ids
NXP-4760: follow changes on date range widget