wip: save & restore client tags