introduce correct per node mark handling and deprecate the always incorrect existing mark handling