fix data-picker