More optimizations for schedule view