dataselector update #368