fixed subname and contact headers