Fix shortcode generation