Updated filter_todate