[OE-2648] refactored correspondence shortcode system