Fix report bug and improve report performance