Move CleanReportBookFilterSet call to proper procedure