Header search fix