hotfixes + data switcher