Dry up tag saving behavior

Ref #4248