some fixes for yearview