V2, Nishi | #653 | Extracting predicate builders for every report type, adding closing treatment reports