[mr2673] Calendar: optimize remapping