fix npe in marker update
fix TestRenameDiagram