[mr2681] Calendar: optimize remapping ||
finally? :)