Better searching through headers