GS: fixed some introduced bugs with heading setup.