search functionality tweaking