Refactored tags so they're not persistent in other places than the catalog.