search functionality improved