fixing dataelement selection to work with widget elements too