diff --git a/src/app/components/shared/file-name/file-name.component.html b/src/app/components/shared/file-name/file-name.component.html
index 1de518b32..3e079148c 100644
--- a/src/app/components/shared/file-name/file-name.component.html
+++ b/src/app/components/shared/file-name/file-name.component.html
@@ -4,7 +4,7 @@
   </span>
 
   <span *ngIf="searchType !== SearchTypes.CUSTOM_PRODUCTS">
-    <span *ngIf="!dataset.includes('Sentinel')">
+    <span *ngIf="!dataset?.includes('Sentinel')">
       {{ name | truncate : sceneNameLen }}
     </span>
 
diff --git a/src/app/components/shared/selectors/other-selector/other-selector.component.html b/src/app/components/shared/selectors/other-selector/other-selector.component.html
index a7bf55ff1..4fc54fb71 100644
--- a/src/app/components/shared/selectors/other-selector/other-selector.component.html
+++ b/src/app/components/shared/selectors/other-selector/other-selector.component.html
@@ -5,7 +5,7 @@
     *ngIf="dataset.id !== 'SENTINEL-1 BURSTS'">
   </app-product-type-selector>
 
-  <mat-form-field *ngIf="dataset.id !== 'OPERA-S1'">
+  <mat-form-field *ngIf="prop.isRelevant(p.BEAM_MODE)">
     <mat-select
       (selectionChange)="onNewDatasetBeamModes($event.value)"
       [(ngModel)]="beamModes"
@@ -65,7 +65,7 @@
     </mat-hint>
   </mat-form-field>
 
-  <mat-form-field *ngIf="dataset.id !== 'OPERA-S1'">
+  <mat-form-field *ngIf="prop.isRelevant(p.SUBTYPE)">
     <mat-select
       (selectionChange)="onNewSubtypeSelected($event.value)"
       [(ngModel)]="subtypes"
@@ -87,7 +87,6 @@
 
   <mat-form-field *ngIf="['SENTINEL-1', 'SENTINEL-1 BURSTS', 'OPERA-S1'].includes(dataset.id)">
     <input matInput
-      
       (input)="onNewGroupID()"
       [(ngModel)]="groupID"
       [maxlength]="29"
diff --git a/src/app/models/dataset.model.ts b/src/app/models/dataset.model.ts
index 6f0c650c2..9a564ce2d 100644
--- a/src/app/models/dataset.model.ts
+++ b/src/app/models/dataset.model.ts
@@ -56,7 +56,9 @@ export type DatasetSubtypes = DatasetSubtype[];
 export const sentinel_1 = fromDatasets.sentinel_1;
 export const sentinel_1_bursts = fromDatasets.sentinel_1_bursts;
 export const opera_s1 = fromDatasets.opera_s1;
+export const opera_disp = fromDatasets.opera_disp;
 export const alos = fromDatasets.alos;
+export const alos_2 = fromDatasets.alos_2;
 export const avnir = fromDatasets.avnir;
 export const sirc = fromDatasets.sirc;
 export const beta = fromDatasets.beta;
@@ -69,6 +71,8 @@ export const airsar = fromDatasets.airsar;
 export const seasat = fromDatasets.seasat;
 
 export const datasetList: Dataset[] = [
+  fromDatasets.alos_2,
+  fromDatasets.opera_disp,
   fromDatasets.sentinel_1,
   fromDatasets.sentinel_1_bursts,
   fromDatasets.opera_s1,
diff --git a/src/app/models/datasets/alos_2.ts b/src/app/models/datasets/alos_2.ts
new file mode 100644
index 000000000..dd9fc4d41
--- /dev/null
+++ b/src/app/models/datasets/alos_2.ts
@@ -0,0 +1,52 @@
+import { Props } from '../filters.model';
+
+export const alos_2 = {
+  id: 'ALOS-2',
+  name: 'ALOS_2',
+  subName: '',
+  beta: false,
+  properties: [
+    Props.DATE,
+    Props.BEAM_MODE,
+    Props.PATH,
+    Props.FRAME,
+    Props.FLIGHT_DIRECTION,
+    Props.POLARIZATION,
+    Props.ABSOLUTE_ORBIT,
+    Props.OFF_NADIR_ANGLE,
+    Props.FARADAY_ROTATION,
+    Props.BASELINE_TOOL,
+    Props.USE_BEAM_MODE
+  ],
+  apiValue: { dataset: 'ALOS-2' },
+  date: {
+    start: new Date('2014/08/01 00:00:00 UTC'),
+  },
+  infoUrl: 'https://www.asf.alaska.edu/sar-data-sets/alos-palsar/',
+  citationUrl: 'https://asf.alaska.edu/data-sets/sar-data-sets/alos-palsar/alos-palsar-how-to-cite/',
+  frequency: 'L-Band',
+  source: {
+    name: 'JAXA/METI',
+    url: 'https://global.jaxa.jp/'
+  },
+  productTypes: [],
+  beamModes: [
+     'WBS',
+     'WBD',
+     'WWS',
+     'WWD',
+     'VBS',
+     'VBD',
+     'WD1',
+     'WD2'
+  ],
+  polarizations: [
+    'HH',
+    'HV',
+    'VV',
+    'VH'
+  ],
+  subtypes: [],
+  platformDesc:  'ALOS_2_DESC' ,
+  platformIcon: '/assets/icons/satellite_alt_black_48dp.svg',
+};
diff --git a/src/app/models/datasets/index.ts b/src/app/models/datasets/index.ts
index 2fca65ae8..51c4aa7a5 100644
--- a/src/app/models/datasets/index.ts
+++ b/src/app/models/datasets/index.ts
@@ -12,3 +12,5 @@ export * from './sirc';
 export * from './avnir';
 export * from './sentinel-1-burst';
 export * from './opera_s1';
+export * from './alos_2';
+export * from './opera_disp';
\ No newline at end of file
diff --git a/src/app/models/datasets/opera_disp.ts b/src/app/models/datasets/opera_disp.ts
new file mode 100644
index 000000000..31bc5e4db
--- /dev/null
+++ b/src/app/models/datasets/opera_disp.ts
@@ -0,0 +1,41 @@
+import { Props } from '../filters.model';
+
+export const opera_disp = {
+  id: 'OPERA-DISP',
+  name: 'OPERA-DISP',
+  subName: '',
+  beta: false,
+  properties: [
+    Props.DATE,
+    Props.FLIGHT_DIRECTION,
+    Props.POLARIZATION,
+  ],
+  apiValue: {
+    dataset: 'OPERA-DISP' },
+  date: { start: new Date('2014/06/15 03:44:43 UTC') },
+  infoUrl: 'https://asf.alaska.edu/datasets/daac/opera/',
+  citationUrl: 'https://asf.alaska.edu/datasets/daac/opera/',
+  frequency: 'C-Band',
+  source: {
+    name: 'OPERA-JPL',
+    url: 'https://www.jpl.nasa.gov/go/opera'
+  },
+  productTypes: [
+  ],
+  beamModes: [
+  ],
+  polarizations: [
+    'VV', 'HH', 'HV', 'VH'
+  ],
+  subtypes: [],
+//   calibrationDatasets: ['OPERA-S1-CALVAL'],
+  calibrationProductTypes: [{
+    apiValue: 'RTC',
+    displayName: 'L2 Radiometric Terrain Corrected (RTC)',
+  }, {
+    apiValue: 'CSLC',
+    displayName: 'L2 Co-registered Single Look Complex (CSLC)',
+  }],
+  platformDesc: 'OPERA_DISP_DESC',
+  platformIcon: '/assets/icons/satellite_alt_black_48dp.svg',
+};
diff --git a/src/app/models/datasets/sentinel-1-burst.ts b/src/app/models/datasets/sentinel-1-burst.ts
index d24a4001d..07be4d26a 100644
--- a/src/app/models/datasets/sentinel-1-burst.ts
+++ b/src/app/models/datasets/sentinel-1-burst.ts
@@ -14,6 +14,7 @@ export const sentinel_1_bursts = {
     Props.BASELINE_TOOL,
     Props.SUBTYPE,
     Props.PATH,
+    Props.USE_BEAM_MODE
   ],
   apiValue: { dataset: 'SLC-BURST' },
   date: { start: new Date('2014/06/15 03:44:43 UTC') },
diff --git a/src/app/models/filters.model.ts b/src/app/models/filters.model.ts
index 61ff6f061..6ff84bcb9 100644
--- a/src/app/models/filters.model.ts
+++ b/src/app/models/filters.model.ts
@@ -14,6 +14,7 @@ export enum Props {
   BASELINE_TOOL = 'Baseline Tool',
   SUBTYPE = 'Subtype',
   POINTING_ANGLE = 'Pointing Angle',
+  USE_BEAM_MODE = 'Use Beam Mode Filter'
 }
 
 export const apiParamNames = {
diff --git a/src/app/services/dataset-for-product.service.ts b/src/app/services/dataset-for-product.service.ts
index ce0cab524..662e941d5 100644
--- a/src/app/services/dataset-for-product.service.ts
+++ b/src/app/services/dataset-for-product.service.ts
@@ -18,6 +18,9 @@ export class DatasetForProductService {
       return models.sentinel_1_bursts;
     }
     if(scene.id.startsWith('OPERA')) {
+      if(scene.id.startsWith('OPERA_L3_DISP')) {
+        return models.opera_disp;
+      }
       return models.opera_s1;
     }
 
diff --git a/src/app/services/product.service.ts b/src/app/services/product.service.ts
index 892637bc4..1e1c0b490 100644
--- a/src/app/services/product.service.ts
+++ b/src/app/services/product.service.ts
@@ -105,10 +105,10 @@ export class ProductService {
     }
 
     private getSubproducts(product: models.CMRProduct): models.CMRProduct[] {
-      if (product.metadata.productType === 'BURST') {
+      if (product.metadata?.productType === 'BURST') {
         return [this.burstXMLFromScene(product)]
       }
-      if (!!product.metadata.opera) {
+      if (!!product.metadata?.opera) {
         return this.operaSubproductsFromScene(product)
       }
       return []
diff --git a/src/app/services/search-params.service.ts b/src/app/services/search-params.service.ts
index 6f51c8ab0..5115f9933 100644
--- a/src/app/services/search-params.service.ts
+++ b/src/app/services/search-params.service.ts
@@ -176,9 +176,9 @@ export class SearchParamsService {
       types => Array.from(new Set(types))
         .join(',')
     ),
-    withLatestFrom(this.store$.select(filterStore.getSelectedDatasetId)),
+    withLatestFrom(this.store$.select(filterStore.getSelectedDataset)),
     map(([beamModes, dataset]) =>
-      dataset === models.sentinel_1_bursts.id ?
+      dataset.properties.includes(models.Props.USE_BEAM_MODE)?
         ({ beamMode: beamModes }) : ({ beamSwath: beamModes }))
   );
 
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 0336e445d..ba843a975 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -738,6 +738,7 @@
   "SENTINEL_1_INTERFEROGRAM_BETA_DESC": "Level 2 standardized Sentinel-1 Interferogram products generated by JPL’s Advanced Rapid Imaging and Analysis (ARIA) project.",
   "SENTINEL_DESC": "Sentinel-1 includes twin satellites that each carry C-band synthetic aperture radar (SAR), together providing all-weather, day-and-night imagery of Earth’s surface.",
   "SEP_OCT_NOV": "Sep, Oct, Nov",
+  "SERIES": "Series",
   "SET": "Set",
   "SET_AS_BASELINE": "Set as Baseline",
   "SET_AS_BOTH": "Set as both",
diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json
index e6166df07..767656739 100644
--- a/src/assets/i18n/es.json
+++ b/src/assets/i18n/es.json
@@ -738,6 +738,7 @@
   "SENTINEL_1_INTERFEROGRAM_BETA_DESC": "El nivel 2 son productos de interferograma Sentinel-1 estandarizados y generados por el proyecto Advanced Rapid Imaging and Analysis (ARIA) del JPL.",
   "SENTINEL_DESC": "Sentinel-1 incluye satélites gemelos, cada uno de los cuales lleva un radar de apertura sintética (SAR) de banda C, juntos brindan imágenes de la superficie de la Tierra para todo clima, día y noche.",
   "SEP_OCT_NOV": "Sep, Oct, Nov",
+  "SERIES": "Serie",
   "SET": "Colocar",
   "SET_AS_BASELINE": "Fijar Línea base",
   "SET_AS_BOTH": "Establecer como ambos",