Fix to filter on now list