First step in header search refactoring