Include date in display query, update form for date format