updated for android tab SPA