Trying to fix dates and list filtering