Updated code for the filter of report and user settings/ management.