Add tag collection and fix create flow