Add common headers to header selector (#1489271)