add DeptaTemplateMaker to annotate next match fields if need