Some improvements for reverse shortcode functionality