Shortcode fixing

The release includes the following fixes:

• missing return value in shortcode logic execution
• wrong template path in shortcode twig partial inclusion