diff --git a/libs/ui/src/lib/activities-table/activities-table.component.stories.ts b/libs/ui/src/lib/activities-table/activities-table.component.stories.ts
index f91c44d6c..e4028e7ba 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.stories.ts
+++ b/libs/ui/src/lib/activities-table/activities-table.component.stories.ts
@@ -421,8 +421,8 @@ export const Loading: Story = {
 
 export const Default: Story = {
   args: {
-    baseCurrency: 'USD',
     dataSource,
+    baseCurrency: 'USD',
     deviceType: 'desktop',
     hasActivities: true,
     hasPermissionToCreateActivity: false,
@@ -475,8 +475,8 @@ export const Pagination: Story = {
 
 export const Actions: Story = {
   args: {
-    baseCurrency: 'USD',
     dataSource,
+    baseCurrency: 'USD',
     deviceType: 'desktop',
     hasActivities: true,
     hasPermissionToCreateActivity: false,
diff --git a/libs/ui/src/lib/assistant/assistant.component.ts b/libs/ui/src/lib/assistant/assistant.component.ts
index df4c1d95b..471420937 100644
--- a/libs/ui/src/lib/assistant/assistant.component.ts
+++ b/libs/ui/src/lib/assistant/assistant.component.ts
@@ -700,6 +700,7 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
       .filter(isIncludedInAssistant)
       .reduce<InternalRoute[]>((acc, route) => {
         acc.push(route);
+
         if (route.subRoutes) {
           acc.push(
             ...Object.values(route.subRoutes).filter(isIncludedInAssistant)