reworked tab persistence