Follow up for box headers (WWW-1638)