Separate shortcode handler/embedded event wrapper from query logic