DC21-603: Fix tags being persisted twice