search view
fix merge