Optimized shortcodes and fixes to post types