Improving search functionality