Added extra shortcode buttons and select arg is supported