diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/.settings/.api_filters b/plugins/org.eclipse.dd.dsf.debug.ui/.settings/.api_filters
index d02be8aa17d..e7f682957c4 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/.settings/.api_filters
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/.settings/.api_filters
@@ -48,10 +48,10 @@
 </message_arguments>
 </filter>
 </resource>
-<resource path="src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterCellModifier.java" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.register.RegisterCellModifier">
+<resource path="src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/expression/IExpressionUpdate.java" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.expression.IExpressionUpdate">
 <filter id="305365105">
 <message_arguments>
-<message_argument value="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.register.RegisterCellModifier"/>
+<message_argument value="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.expression.IExpressionUpdate"/>
 <message_argument value="org.eclipse.dd.dsf.debug.ui_1.1.0"/>
 </message_arguments>
 </filter>
@@ -64,10 +64,10 @@
 </message_arguments>
 </filter>
 </resource>
-<resource path="src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/expression/IExpressionUpdate.java" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.expression.IExpressionUpdate">
+<resource path="src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterCellModifier.java" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.register.RegisterCellModifier">
 <filter id="305365105">
 <message_arguments>
-<message_argument value="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.expression.IExpressionUpdate"/>
+<message_argument value="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.register.RegisterCellModifier"/>
 <message_argument value="org.eclipse.dd.dsf.debug.ui_1.1.0"/>
 </message_arguments>
 </filter>
@@ -88,14 +88,6 @@
 </message_arguments>
 </filter>
 </resource>
-<resource path="src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterBitFieldCellModifier.java" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.register.RegisterBitFieldCellModifier">
-<filter id="305365105">
-<message_arguments>
-<message_argument value="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.register.RegisterBitFieldCellModifier"/>
-<message_argument value="org.eclipse.dd.dsf.debug.ui_1.1.0"/>
-</message_arguments>
-</filter>
-</resource>
 <resource path="src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/update/BreakpointHitUpdatePolicy.java" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.update.BreakpointHitUpdatePolicy">
 <filter id="305365105">
 <message_arguments>
@@ -104,6 +96,14 @@
 </message_arguments>
 </filter>
 </resource>
+<resource path="src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterBitFieldCellModifier.java" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.register.RegisterBitFieldCellModifier">
+<filter id="305365105">
+<message_arguments>
+<message_argument value="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.register.RegisterBitFieldCellModifier"/>
+<message_argument value="org.eclipse.dd.dsf.debug.ui_1.1.0"/>
+</message_arguments>
+</filter>
+</resource>
 <resource path="src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/expression/ExpressionVMProvider.java" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.expression.ExpressionVMProvider">
 <filter id="305365105">
 <message_arguments>
@@ -192,14 +192,6 @@
 </message_arguments>
 </filter>
 </resource>
-<resource path="src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/expression/AbstractExpressionVMNode.java" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.expression.AbstractExpressionVMNode">
-<filter id="305365105">
-<message_arguments>
-<message_argument value="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.expression.AbstractExpressionVMNode"/>
-<message_argument value="org.eclipse.dd.dsf.debug.ui_1.1.0"/>
-</message_arguments>
-</filter>
-</resource>
 <resource path="src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/variable/SyncVariableDataAccess.java" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.variable.SyncVariableDataAccess">
 <filter id="305365105">
 <message_arguments>
@@ -208,6 +200,14 @@
 </message_arguments>
 </filter>
 </resource>
+<resource path="src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/expression/AbstractExpressionVMNode.java" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.expression.AbstractExpressionVMNode">
+<filter id="305365105">
+<message_arguments>
+<message_argument value="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.expression.AbstractExpressionVMNode"/>
+<message_argument value="org.eclipse.dd.dsf.debug.ui_1.1.0"/>
+</message_arguments>
+</filter>
+</resource>
 <resource path="src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/modules/ModulesVMNode.java" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.modules.ModulesVMNode">
 <filter id="305365105">
 <message_arguments>
@@ -224,14 +224,6 @@
 </message_arguments>
 </filter>
 </resource>
-<resource path="src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/numberformat/IFormattedValueVMContext.java" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.IFormattedValueVMContext">
-<filter id="305365105">
-<message_arguments>
-<message_argument value="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.IFormattedValueVMContext"/>
-<message_argument value="org.eclipse.dd.dsf.debug.ui_1.1.0"/>
-</message_arguments>
-</filter>
-</resource>
 <resource path="src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/update/actions/RefreshActionDelegate.java" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.update.actions.RefreshActionDelegate">
 <filter id="305365105">
 <message_arguments>
@@ -240,6 +232,14 @@
 </message_arguments>
 </filter>
 </resource>
+<resource path="src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/numberformat/IFormattedValueVMContext.java" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.IFormattedValueVMContext">
+<filter id="305365105">
+<message_arguments>
+<message_argument value="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.IFormattedValueVMContext"/>
+<message_argument value="org.eclipse.dd.dsf.debug.ui_1.1.0"/>
+</message_arguments>
+</filter>
+</resource>
 <resource path="src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/expression/IExpressionVMNode.java" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.expression.IExpressionVMNode">
 <filter id="305365105">
 <message_arguments>
@@ -264,14 +264,6 @@
 </message_arguments>
 </filter>
 </resource>
-<resource path="src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/numberformat/FormattedValuePreferenceStore.java" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.FormattedValuePreferenceStore">
-<filter id="305365105">
-<message_arguments>
-<message_argument value="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.FormattedValuePreferenceStore"/>
-<message_argument value="org.eclipse.dd.dsf.debug.ui_1.1.0"/>
-</message_arguments>
-</filter>
-</resource>
 <resource path="src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/variable/VariableCellModifier.java" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.variable.VariableCellModifier">
 <filter id="305365105">
 <message_arguments>
@@ -280,6 +272,14 @@
 </message_arguments>
 </filter>
 </resource>
+<resource path="src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/numberformat/FormattedValuePreferenceStore.java" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.FormattedValuePreferenceStore">
+<filter id="305365105">
+<message_arguments>
+<message_argument value="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.FormattedValuePreferenceStore"/>
+<message_argument value="org.eclipse.dd.dsf.debug.ui_1.1.0"/>
+</message_arguments>
+</filter>
+</resource>
 <resource path="src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/expression/ExpressionVMProviderModelProxyStrategy.java" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.expression.ExpressionVMProviderModelProxyStrategy">
 <filter id="305365105">
 <message_arguments>
@@ -288,22 +288,6 @@
 </message_arguments>
 </filter>
 </resource>
-<resource path="src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterVMNode.java" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.register.RegisterVMNode">
-<filter id="305365105">
-<message_arguments>
-<message_argument value="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.register.RegisterVMNode"/>
-<message_argument value="org.eclipse.dd.dsf.debug.ui_1.1.0"/>
-</message_arguments>
-</filter>
-</resource>
-<resource path="src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/variable/VariableColumnPresentation.java" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.variable.VariableColumnPresentation">
-<filter id="305365105">
-<message_arguments>
-<message_argument value="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.variable.VariableColumnPresentation"/>
-<message_argument value="org.eclipse.dd.dsf.debug.ui_1.1.0"/>
-</message_arguments>
-</filter>
-</resource>
 <resource path="META-INF/MANIFEST.MF" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.AbstractSetFormatStyle">
 <filter id="305324134">
 <message_arguments>
@@ -312,14 +296,6 @@
 </message_arguments>
 </filter>
 </resource>
-<resource path="META-INF/MANIFEST.MF" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.update.actions.SelectUpdatePolicyAction">
-<filter id="305324134">
-<message_arguments>
-<message_argument value="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.update.actions.SelectUpdatePolicyAction"/>
-<message_argument value="org.eclipse.dd.dsf.debug.ui_1.1.0"/>
-</message_arguments>
-</filter>
-</resource>
 <resource path="META-INF/MANIFEST.MF">
 <filter id="923795461">
 <message_arguments>
@@ -328,6 +304,14 @@
 </message_arguments>
 </filter>
 </resource>
+<resource path="META-INF/MANIFEST.MF" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.update.actions.SelectUpdatePolicyAction">
+<filter id="305324134">
+<message_arguments>
+<message_argument value="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.update.actions.SelectUpdatePolicyAction"/>
+<message_argument value="org.eclipse.dd.dsf.debug.ui_1.1.0"/>
+</message_arguments>
+</filter>
+</resource>
 <resource path="META-INF/MANIFEST.MF" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatBinary">
 <filter id="305324134">
 <message_arguments>
@@ -336,4 +320,28 @@
 </message_arguments>
 </filter>
 </resource>
+<resource path="META-INF/MANIFEST.MF" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatDecimal">
+<filter id="305324134">
+<message_arguments>
+<message_argument value="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatDecimal"/>
+<message_argument value="org.eclipse.dd.dsf.debug.ui_1.1.0"/>
+</message_arguments>
+</filter>
+</resource>
+<resource path="src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/variable/VariableColumnPresentation.java" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.variable.VariableColumnPresentation">
+<filter id="305365105">
+<message_arguments>
+<message_argument value="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.variable.VariableColumnPresentation"/>
+<message_argument value="org.eclipse.dd.dsf.debug.ui_1.1.0"/>
+</message_arguments>
+</filter>
+</resource>
+<resource path="src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterVMNode.java" type="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.register.RegisterVMNode">
+<filter id="305365105">
+<message_arguments>
+<message_argument value="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.register.RegisterVMNode"/>
+<message_argument value="org.eclipse.dd.dsf.debug.ui_1.1.0"/>
+</message_arguments>
+</filter>
+</resource>
 </component>