Dates are now taken into consideration with normalized or non normalized filtering taken into account