fix more dictionary keys.   Id