Fix issues with data tab