Clean up some search API stuff