Allow hiding of single tabs
Fix merge