Remove grace period and use search start and search end dates