LPS-35434 fix bugs introduced with the toolbar migration