Updated initial search functionality.