Make some progress on getting the new search to work