Add before/after support to shortcode for #1892