We don't display the ability to edit tags on edit anymore (which is consistent with thread editing, and resource editing).
To add or edit tags, you can click the tags icon:
I believe you have since seen the custom field phrases issue get resolved, but thanks to your report we did identify an issue in the XFMG 2.0 upgrade script which you would have run into. This has been solved for subsequent new upgrades for other users upgrading to 2.0/2.1.