changes for tablecombo, dtweek, datechooser singlesource