basic and advanced search functionality
search functionality
Merge branch 'danielle'