marckup hole add form fixes (#7201)