some weird merge
remove 'picker' from fs-date & fs-datetime