Moved date select data into controller