Fixed form name and added hack for tabset directive