headers selection fixes