diff --git a/src/app/collection-detail-etb/collection-detail-etb.page.html b/src/app/collection-detail-etb/collection-detail-etb.page.html
index 8f3a4db51a..34f77a354a 100644
--- a/src/app/collection-detail-etb/collection-detail-etb.page.html
+++ b/src/app/collection-detail-etb/collection-detail-etb.page.html
@@ -9,7 +9,8 @@
     [showDownloadBtn]="showDownloadBtn"
     [isDepthChild]='isDepthChild' 
     [defaultAppIcon]="defaultAppIcon"
-    [trackDownloads]="trackDownloads$">
+    [trackDownloads]="trackDownloads$"
+    [frameworkCategories]="categories">
     </app-detail-card>
     <!-- End of the Parent Card -->
 
diff --git a/src/app/components/detail-card/detail-card.component.html b/src/app/components/detail-card/detail-card.component.html
index 8bbd99ed1c..4abb01045a 100644
--- a/src/app/components/detail-card/detail-card.component.html
+++ b/src/app/components/detail-card/detail-card.component.html
@@ -1,5 +1,5 @@
 <div class="sb-dt-card">
-<app-toc-header [contentData]="contentDetail?.contentData"></app-toc-header>
+<app-toc-header [contentData]="contentDetail?.contentData" [frameworkCategories]="frameworkCategories"></app-toc-header>
   <div class="sb-dt-content pt-0">
     <div class="left">
     </div>
diff --git a/src/app/components/detail-card/detail-card.component.ts b/src/app/components/detail-card/detail-card.component.ts
index accb7e35ca..6b27ee0af9 100644
--- a/src/app/components/detail-card/detail-card.component.ts
+++ b/src/app/components/detail-card/detail-card.component.ts
@@ -15,6 +15,7 @@ export class DetailCardComponent {
   @Input() showDownloadBtn: boolean;
   @Input() isDepthChild: boolean;
   @Input() trackDownloads: Observable<DownloadTracking>;
+  @Input() frameworkCategories: any;
 
   @Output() downloadAllContent = new EventEmitter();
   @Output() showOverflowMenuEvent = new EventEmitter();
diff --git a/src/app/components/toc-header/toc-header.component.html b/src/app/components/toc-header/toc-header.component.html
index d4e1efc690..92e58ebaeb 100644
--- a/src/app/components/toc-header/toc-header.component.html
+++ b/src/app/components/toc-header/toc-header.component.html
@@ -6,20 +6,11 @@
             <span class="sb-by">{{ 'CONTENT_CREATED_BY' | translate }}</span>
             <span class="sb-user">{{ contentData?.owner || contentData?.creator}}</span>
         </div>
-        <div class="sb-dt-class-info" *ngIf="contentData?.gradeLevel || contentData?.subject">
-            <span *ngIf="contentData?.board">
-                <span class="sb-dt-label sb-dt-subject">{{contentData?.board}}</span>
-                <span class="sb-separator-dot"></span>
+        <div class="sb-dt-class-info">
+            <span *ngFor="let category of frameworkCategories; let i = index">
+                <span class="sb-dt-label sb-dt-subject" *ngIf="contentData?.[category.code] || contentData?.[category.alterNativeCode]">{{contentData[category.code] || contentData[category.alterNativeCode]}}</span>
+                <span class="sb-separator-dot" *ngIf="i < frameworkCategories.length-1 && contentData?.[category.code]"></span>
             </span>
-            <span *ngIf="contentData?.medium">
-                <span class="sb-dt-label sb-dt-subject">{{contentData?.medium}}</span>
-                <span class="sb-separator-dot"></span>
-            </span>
-            <span *ngIf="contentData?.gradeLevel">
-                <span class="sb-dt-label sb-dt-subject">{{contentData?.gradeLevel}}</span>
-                <span class="sb-separator-dot"></span>
-            </span>
-            <span class="sb-dt-label sb-dt-subject">{{contentData?.subject | csa}}</span>
         </div>
     </div>
     <div class="right">
diff --git a/src/app/components/toc-header/toc-header.component.ts b/src/app/components/toc-header/toc-header.component.ts
index 45df02815b..d1a6089fd2 100644
--- a/src/app/components/toc-header/toc-header.component.ts
+++ b/src/app/components/toc-header/toc-header.component.ts
@@ -10,6 +10,7 @@ import { CommonUtilService } from '../../../services/common-util.service';
 })
 export class TocHeaderComponent {
   @Input() contentData: ContentData;
+  @Input() frameworkCategories: any;
 
   // defaultIcon
   defaultAppIcon: string;
diff --git a/src/app/enrolled-course-details-page/enrolled-course-details-page.html b/src/app/enrolled-course-details-page/enrolled-course-details-page.html
index 4d41cdaa10..394e729073 100644
--- a/src/app/enrolled-course-details-page/enrolled-course-details-page.html
+++ b/src/app/enrolled-course-details-page/enrolled-course-details-page.html
@@ -1,7 +1,7 @@
 <ion-content>
 	<div class="p-8" *ngIf="!showOfflineSection">
 		<ion-card class="sb-dt-card">
-	        <app-toc-header [contentData]="course || courseCardData?.content"></app-toc-header>
+	        <app-toc-header [contentData]="course || courseCardData?.content" [frameworkCategories]="categories"></app-toc-header>
 			  <div class="hr-border-bottom"></div>
 			<ion-card-content class="sb-content-info">
 				<div *ngIf="isFromGroupFlow">
diff --git a/src/app/profile-settings/profile-settings.page.ts b/src/app/profile-settings/profile-settings.page.ts
index d8295975a8..06777ed0b4 100644
--- a/src/app/profile-settings/profile-settings.page.ts
+++ b/src/app/profile-settings/profile-settings.page.ts
@@ -124,7 +124,7 @@ export class ProfileSettingsPage implements OnInit, OnDestroy, AfterViewInit {
     private onboardingConfigurationService: OnboardingConfigurationService
   ) {
     this.defaultFrameworkID = window.history.state.defaultFrameworkID;
-    this.defaultRootOrgId = window.history.state.rootOrgId || '*';
+    this.defaultRootOrgId = window.history.state.rootOrgId;
   }
 
   async ngOnInit() {