fix more year calculation fields