Fixed some issues related to onComplete hooks for toolbar and tabs