fix bug on internal saving, cleanup consultant form template