add search history mgmt
fix merge conflicts