More work on filtering, beginning to put in date filtering