shortcode options fixes