refinements, fix to tab id being nulled