Added option to force use of the date picker