Quick fix for tabs and the change in expected data structure