Adding history search support