Bugfix 12828

Partial fix to bug 12828, but represents significant improvement in tabbed field rendering so probably worth including in DP7.