Clean up search builder