Various improvements for importing and tagging