fixes for sidebars and subscription units for apple takeover