Search functionality improved