Completely remove nesting of term records (only create was left nested)
Provide variables for generic new/edit form and allow collection_id change
Refactor to use generic form for new and edit and extract logic from it