fixing how unid is used for feature selection
null checks