Finished up DateFilter

lots of cleanup