Improving the searchable widget