Fix up tag importing/updating