Further work on search widget TO BE COMPLETED