fix: preserve tag granularity and avoid suffix duplication