Changed Calendar dates highlighting functionality according to latest logic