[#ENGINE-27: added shortcode fixes]