Logic revision on shortcode