Refactor tag flow
DoubleCheck import routine