fixed bugs in shortcode