Issue #22393: Added more report elements