fixes for tags in form and report
Merge pull request #624 from rmehta/develop

fixes for tags in form and report