Further work on the search widget