Closes #294: split date control into Aging and Date Range