Improvements for ad (shortcode encoding) and popup (shortcode encoding, JS display).