fix last report bug and add the cross query function