Various shortcodes fixes and enhancements