Addition to fix #1 for the tab content issue