Updated rules using new report editor