Hotfix: add tags back in form