fixes to import forms and links in tables