added date filters and name filter