Reports update and Shortcode conflict issue fix