Fixed a couple of bugs in rendering the two interactive shortcodes.