header search fixes