Clean up some search stuff