fixes for tags in form and report