more bug fixes to head node table handling