AI-664 : added subformtype