Ticket/12598

Update Searchbars