WP-735 Reworking of shortcode templates for listing lists for compatibility