Bugfixes/euca 7359

Tag editor is still sort of wonky in this branch, but fixed separately in EUCA-7344.