Replace calendar_date_select calls