tag persistence fixes