Shortcode API tweaks + movie headbox filter fix