add more query option for the report. Format the output