merge the tbthdl_sub with Vo's change on NOTNULL