Fix issue with tabs not being populated