Added date condition to non period indicators