Broke entity import, merge var form fields out into own functions. Both now available without a template selected.
Merge vars now automatically updated for non-template content on list change.