Remove flicker when changing dates