Shortcode db upgrade fixes