Tweaks for annie and shortcode