Fixes for max depth global and adding in shortcode attrbts