Combined Search and Choose Date resolves #18