CB-5910 added topbar directive which includes search