more work on search functionality