Remove duplicate search for headers