diff --git a/frontend/src/components/BCDataGrid/components/Editors/DateEditor.jsx b/frontend/src/components/BCDataGrid/components/Editors/DateEditor.jsx
index fa4ca4ca6..01321d990 100644
--- a/frontend/src/components/BCDataGrid/components/Editors/DateEditor.jsx
+++ b/frontend/src/components/BCDataGrid/components/Editors/DateEditor.jsx
@@ -1,7 +1,6 @@
-import { DatePicker, LocalizationProvider } from '@mui/x-date-pickers'
-import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFnsV3'
+import { DatePicker } from '@mui/x-date-pickers'
 import { format, parseISO } from 'date-fns'
-import { useState, useEffect, useRef } from 'react'
+import { useEffect, useRef, useState } from 'react'
 
 export const DateEditor = ({ value, onValueChange, minDate, maxDate }) => {
   const [selectedDate, setSelectedDate] = useState(
@@ -52,28 +51,26 @@ export const DateEditor = ({ value, onValueChange, minDate, maxDate }) => {
       onMouseDown={stopPropagation}
       onClick={stopPropagation}
     >
-      <LocalizationProvider dateAdapter={AdapterDateFns}>
-        <DatePicker
-          className="ag-grid-date-editor ag-input-field"
-          fullWidth
-          margin="normal"
-          id="date-picker-dialog"
-          format="yyyy-MM-dd"
-          slotProps={{
-            field: { clearable: true },
-            popper: { placement: 'bottom-start' }
-          }}
-          value={selectedDate}
-          onChange={updateValue}
-          open={isOpen}
-          onOpen={handleDatePickerOpen}
-          onClose={handleDatePickerClose}
-          variant="inline"
-          disableToolbar
-          minDate={minDate}
-          maxDate={maxDate}
-        />
-      </LocalizationProvider>
+      <DatePicker
+        className="ag-grid-date-editor ag-input-field"
+        fullWidth
+        margin="normal"
+        id="date-picker-dialog"
+        format="yyyy-MM-dd"
+        slotProps={{
+          field: { clearable: true },
+          popper: { placement: 'bottom-start' }
+        }}
+        value={selectedDate}
+        onChange={updateValue}
+        open={isOpen}
+        onOpen={handleDatePickerOpen}
+        onClose={handleDatePickerClose}
+        variant="inline"
+        disableToolbar
+        minDate={minDate}
+        maxDate={maxDate}
+      />
     </div>
   )
 }
diff --git a/frontend/src/components/BCDataGrid/components/Filters/BCColumnSetFilter.jsx b/frontend/src/components/BCDataGrid/components/Filters/BCColumnSetFilter.jsx
index 785cbb8de..206d0acf4 100644
--- a/frontend/src/components/BCDataGrid/components/Filters/BCColumnSetFilter.jsx
+++ b/frontend/src/components/BCDataGrid/components/Filters/BCColumnSetFilter.jsx
@@ -66,6 +66,7 @@ export const BCColumnSetFilter = forwardRef((props, ref) => {
       multiple={props.multiple}
       disableCloseOnSelect={props.disableCloseOnSelect}
       onChange={onInputBoxChanged}
+      openOnFocus
       isOptionEqualToValue={(option, value) => option.name === value.name}
       limitTags={1}
       className="bc-column-set-filter ag-list ag-select-list ag-ltr ag-popup-child ag-popup-positioned-under"
@@ -79,7 +80,7 @@ export const BCColumnSetFilter = forwardRef((props, ref) => {
       renderOption={(propsIn, option, { selected }) => (
         <Box
           component="li"
-          key={option}
+          key={option.name}
           className={
             selected
               ? 'ag-list-item ag-select-list-item selected'
diff --git a/frontend/src/main.jsx b/frontend/src/main.jsx
index 941a3e9b9..c6116f53f 100644
--- a/frontend/src/main.jsx
+++ b/frontend/src/main.jsx
@@ -6,6 +6,8 @@ import theme from '@/themes'
 import './i18n'
 import { KeycloakProvider } from '@/components/KeycloakProvider'
 import { getKeycloak } from '@/utils/keycloak'
+import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs'
+import { LocalizationProvider } from '@mui/x-date-pickers'
 
 const queryClient = new QueryClient()
 const keycloak = getKeycloak()
@@ -17,8 +19,10 @@ if (root) {
       <KeycloakProvider authClient={keycloak}>
         <QueryClientProvider client={queryClient}>
           <ThemeProvider theme={theme}>
-            <CssBaseline />
-            <App />
+            <LocalizationProvider dateAdapter={AdapterDayjs}>
+              <CssBaseline />
+              <App />
+            </LocalizationProvider>
           </ThemeProvider>
         </QueryClientProvider>
       </KeycloakProvider>
diff --git a/frontend/src/views/Admin/AdminMenu/components/_schema.js b/frontend/src/views/Admin/AdminMenu/components/_schema.js
index 23a63525f..ca5327d02 100644
--- a/frontend/src/views/Admin/AdminMenu/components/_schema.js
+++ b/frontend/src/views/Admin/AdminMenu/components/_schema.js
@@ -47,7 +47,6 @@ export const usersColumnDefs = (t) => [
       suppressFilterButton: true
     },
     floatingFilterComponent: BCColumnSetFilter,
-    suppressFloatingFilterButton: true,
     floatingFilterComponentParams: {
       apiQuery: useRoleList, // all data returned should be an array which includes an object of key 'name'
       // Eg: [{id: 1, name: 'EntryListItem' }] except name all others are optional
@@ -88,7 +87,6 @@ export const usersColumnDefs = (t) => [
     cellRenderer: StatusRenderer,
     cellClass: 'vertical-middle',
     floatingFilterComponent: BCColumnSetFilter,
-    suppressFloatingFilterButton: true,
     floatingFilterComponentParams: {
       apiQuery: () => ({
         data: [
@@ -252,7 +250,6 @@ export const auditLogColDefs = (t) => [
     flex: 1,
     valueGetter: ({ data }) => data.createDate || '',
     valueFormatter: timezoneFormatter,
-    suppressFloatingFilterButton: true,
     filter: 'agDateColumnFilter',
     filterParams: {
       filterOptions: ['equals', 'lessThan', 'greaterThan', 'inRange'],
diff --git a/frontend/src/views/ComplianceReports/components/_schema.jsx b/frontend/src/views/ComplianceReports/components/_schema.jsx
index eeba24abc..e83fcdc19 100644
--- a/frontend/src/views/ComplianceReports/components/_schema.jsx
+++ b/frontend/src/views/ComplianceReports/components/_schema.jsx
@@ -1,4 +1,3 @@
-/* eslint-disable chai-friendly/no-unused-expressions */
 import { BCColumnSetFilter } from '@/components/BCDataGrid/components'
 import { SUMMARY } from '@/constants/common'
 import { ReportsStatusRenderer, LinkRenderer } from '@/utils/grid/cellRenderers'
@@ -14,7 +13,6 @@ export const reportsColDefs = (t, bceidRole) => [
       url: ({ data }) =>
         `${data.compliancePeriod?.description}/${data.complianceReportId}`
     },
-    suppressFloatingFilterButton: true,
     valueGetter: ({ data }) => data.compliancePeriod?.description || '',
     filterParams: {
       buttons: ['clear']
@@ -42,7 +40,6 @@ export const reportsColDefs = (t, bceidRole) => [
       return `${typeLabel}${nickname}`
     },
     filter: 'agTextColumnFilter', // Enable text filtering
-    suppressFloatingFilterButton: true,
     filterParams: {
       textFormatter: (value) => value.replace(/\s+/g, '').toLowerCase(),
       textCustomComparator: (filter, value, filterText) => {
@@ -96,12 +93,12 @@ export const reportsColDefs = (t, bceidRole) => [
     flex: 1,
     valueGetter: ({ data }) => data.updateDate || '',
     valueFormatter: timezoneFormatter,
-    suppressFloatingFilterButton: true,
     filter: 'agDateColumnFilter',
     filterParams: {
       filterOptions: ['equals', 'lessThan', 'greaterThan', 'inRange'],
       suppressAndOrCondition: true,
-      buttons: ['clear']
+      buttons: ['clear'],
+      maxValidYear: 2400
     }
   }
 ]
diff --git a/frontend/src/views/FuelCodes/_schema.jsx b/frontend/src/views/FuelCodes/_schema.jsx
index dc4e430ed..b3a41d55a 100644
--- a/frontend/src/views/FuelCodes/_schema.jsx
+++ b/frontend/src/views/FuelCodes/_schema.jsx
@@ -1,4 +1,3 @@
-import { KEY_ENTER, KEY_TAB } from '@/constants/common'
 import {
   CommonArrayRenderer,
   FuelCodeStatusTextRenderer,
@@ -6,14 +5,6 @@ import {
 } from '@/utils/grid/cellRenderers'
 import { numberFormatter, timezoneFormatter } from '@/utils/formatters'
 import { Typography } from '@mui/material'
-import { v4 as uuid } from 'uuid'
-import * as yup from 'yup'
-import {
-  AutocompleteCellEditor,
-  RequiredHeader,
-  NumberEditor
-} from '@/components/BCDataGrid/components'
-
 
 export const fuelCodeColDefs = (t) => [
   {
@@ -65,21 +56,45 @@ export const fuelCodeColDefs = (t) => [
   {
     field: 'applicationDate',
     headerName: t('fuelCode:fuelCodeColLabels.applicationDate'),
+    filter: 'agDateColumnFilter',
+    filterParams: {
+      filterOptions: ['equals', 'lessThan', 'greaterThan', 'inRange'],
+      suppressAndOrCondition: true,
+      maxValidYear: 2400
+    },
     cellRenderer: TextRenderer
   },
   {
     field: 'approvalDate',
     headerName: t('fuelCode:fuelCodeColLabels.approvalDate'),
+    filter: 'agDateColumnFilter',
+    filterParams: {
+      filterOptions: ['equals', 'lessThan', 'greaterThan', 'inRange'],
+      suppressAndOrCondition: true,
+      maxValidYear: 2400
+    },
     cellRenderer: TextRenderer
   },
   {
     field: 'effectiveDate',
     headerName: t('fuelCode:fuelCodeColLabels.effectiveDate'),
+    filter: 'agDateColumnFilter',
+    filterParams: {
+      filterOptions: ['equals', 'lessThan', 'greaterThan', 'inRange'],
+      suppressAndOrCondition: true,
+      maxValidYear: 2400
+    },
     cellRenderer: TextRenderer
   },
   {
     field: 'expirationDate',
     headerName: t('fuelCode:fuelCodeColLabels.expiryDate'),
+    filter: 'agDateColumnFilter',
+    filterParams: {
+      filterOptions: ['equals', 'lessThan', 'greaterThan', 'inRange'],
+      suppressAndOrCondition: true,
+      maxValidYear: 2400
+    },
     cellRenderer: TextRenderer
   },
   {
@@ -184,560 +199,3 @@ export const fuelCodeColDefs = (t) => [
     minWidth: 600
   }
 ]
-
-export const addEditSchema = {
-  duplicateRow: (props) => {
-    const newRow = {
-      ...props.data,
-      id: uuid(),
-      modified: true,
-      fuelSuffix: '100' + '.' + `${props.node?.rowIndex + 1}`
-    }
-    props.api.applyTransaction({
-      add: [newRow],
-      addIndex: props.node?.rowIndex + 1
-    })
-    props.api.stopEditing()
-  },
-
-  fuelCodeSchema: (t, optionsData) =>
-    yup.object().shape({
-      prefix: yup
-        .string()
-        .oneOf(
-          optionsData.fuelCodePrefixes.map((obj) => obj.prefix),
-          t('fuelCode:validateMsg.prefix')
-        )
-        .required(
-          t('fuelCode:validateMsg.isRequired', {
-            field: t('fuelCode:fuelCodeColLabels.prefix')
-          })
-        ),
-      fuelSuffix: yup.number().required(
-        t('fuelCode:validateMsg.isRequired', {
-          field: t('fuelCode:fuelCodeColLabels.fuelSuffix')
-        })
-      ),
-      company: yup.string().required(
-        t('fuelCode:validateMsg.isRequired', {
-          field: t('fuelCode:fuelCodeColLabels.company')
-        })
-      ),
-      carbonIntensity: yup.number().required(
-        t('fuelCode:validateMsg.isRequired', {
-          field: t('fuelCode:fuelCodeColLabels.carbonIntensity')
-        })
-      ),
-      edrms: yup.string().required(
-        t('fuelCode:validateMsg.isRequired', {
-          field: t('fuelCode:fuelCodeColLabels.edrms')
-        })
-      ),
-      applicationDate: yup.date().required(
-        t('fuelCode:validateMsg.isRequired', {
-          field: t('fuelCode:fuelCodeColLabels.applicationDate')
-        })
-      ),
-      fuel: yup
-        .string()
-        .oneOf(
-          optionsData.fuelTypes
-            .filter((fuel) => !fuel.fossilDerived)
-            .map((obj) => obj.fuelType),
-          t('fuelCode:validateMsg.fuel')
-        )
-        .required(
-          t('fuelCode:validateMsg.isRequired', {
-            field: t('fuelCode:fuelCodeColLabels.fuel')
-          })
-        ),
-      feedstock: yup.string().required(
-        t('fuelCode:validateMsg.isRequired', {
-          field: t('fuelCode:fuelCodeColLabels.feedstock')
-        })
-      ),
-      feedstockLocation: yup.string().required(
-        t('fuelCode:validateMsg.isRequired', {
-          field: t('fuelCode:fuelCodeColLabels.feedstockLocation')
-        })
-      ),
-      fuelProductionFacilityCity: yup.string().required(
-        t('fuelCode:validateMsg.isRequired', {
-          field: t('fuelCode:fuelCodeColLabels.fuelProductionFacilityCity')
-        })
-      ),
-      fuelProductionFacilityProvinceState: yup.string().required(
-        t('fuelCode:validateMsg.isRequired', {
-          field: t(
-            'fuelCode:fuelCodeColLabels.fuelProductionFacilityProvinceState'
-          )
-        })
-      ),
-      fuelProductionFacilityCountry: yup.string().required(
-        t('fuelCode:validateMsg.isRequired', {
-          field: t('fuelCode:fuelCodeColLabels.fuelProductionFacilityCountry')
-        })
-      )
-    }),
-  fuelCodeColDefs: (t, optionsData, isDraftOrNew = true) => [
-    {
-      colId: 'action',
-      cellRenderer: 'actionsRenderer',
-      cellRendererParams: {
-        enableDuplicate: true,
-        enableEdit: false,
-        enableDelete: true,
-        onDuplicate: addEditSchema.duplicateRow
-      },
-      pinned: 'left',
-      maxWidth: 100,
-      editable: false,
-      suppressKeyboardEvent: (params) =>
-        params.event.key === KEY_ENTER || params.event.key === KEY_TAB,
-      filter: false,
-      hide: !isDraftOrNew
-    },
-    {
-      field: 'id',
-      cellEditor: 'agTextCellEditor',
-      cellDataType: 'text',
-      hide: true
-    },
-    {
-      field: 'prefix',
-      headerComponent: isDraftOrNew ? RequiredHeader : undefined,
-      headerName: t('fuelCode:fuelCodeColLabels.prefix'),
-      cellEditor: AutocompleteCellEditor,
-      cellRenderer: (params) =>
-        params.value ||
-        (!params.value && <Typography variant="body4">Select</Typography>),
-      cellEditorParams: {
-        options: optionsData.fuelCodePrefixes.map((obj) => obj.prefix),
-        multiple: false, // ability to select multiple values from dropdown
-        disableCloseOnSelect: false, // if multiple is true, this will prevent closing dropdown on selecting an option
-        freeSolo: false, // this will allow user to type in the input box or choose from the dropdown
-        openOnFocus: true // this will open the dropdown on input focus
-      },
-      suppressKeyboardEvent: (params) => {
-        // return true (to suppress) if editing and user hit Enter key
-        return params.editing && params.event.key === KEY_ENTER
-      },
-      cellStyle: (params) => {
-        if (params.data.modified && (!params.value || params.value === ''))
-          return { borderColor: 'red' }
-      },
-      cellDataType: 'text',
-      minWidth: 135,
-      editable: isDraftOrNew
-    },
-    {
-      field: 'fuelSuffix',
-      headerComponent: isDraftOrNew ? RequiredHeader : undefined,
-      headerName: t('fuelCode:fuelCodeColLabels.fuelSuffix'),
-      cellDataType: 'text',
-      editable: false
-    },
-    {
-      field: 'carbonIntensity',
-      headerComponent: isDraftOrNew ? RequiredHeader : undefined,
-      headerName: t('fuelCode:fuelCodeColLabels.carbonIntensity'),
-      cellEditor: 'agNumberCellEditor',
-      cellEditorParams: {
-        precision: 2,
-        showStepperButtons: false
-      },
-      cellStyle: (params) => {
-        if (params.data.modified && !params.value) return { borderColor: 'red' }
-      },
-      type: 'numericColumn',
-      editable: isDraftOrNew
-    },
-    {
-      field: 'edrms',
-      headerComponent: isDraftOrNew ? RequiredHeader : undefined,
-      headerName: t('fuelCode:fuelCodeColLabels.edrms'),
-      cellEditor: 'agTextCellEditor',
-      cellStyle: (params) => {
-        if (params.data.modified && (!params.value || params.value === ''))
-          return { borderColor: 'red' }
-      },
-      cellDataType: 'text',
-      editable: isDraftOrNew
-    },
-    {
-      field: 'company',
-      headerComponent: isDraftOrNew ? RequiredHeader : undefined,
-      headerName: t('fuelCode:fuelCodeColLabels.company'),
-      cellEditor: 'agTextCellEditor',
-      cellDataType: 'text',
-      cellStyle: (params) => {
-        if (params.data.modified && (!params.value || params.value === ''))
-          return { borderColor: 'red' }
-      },
-      minWidth: 300,
-      editable: isDraftOrNew
-    },
-    {
-      field: 'contactName',
-      headerName: t('fuelCode:fuelCodeColLabels.contactName'),
-      cellEditor: 'agTextCellEditor',
-      cellDataType: 'text',
-      minWidth: 300,
-      editable: isDraftOrNew
-    },
-    {
-      field: 'contactEmail',
-      headerName: t('fuelCode:fuelCodeColLabels.contactEmail'),
-      cellEditor: 'agTextCellEditor',
-      cellDataType: 'text',
-      minWidth: 300,
-      editable: isDraftOrNew
-    },
-
-    {
-      field: 'lastUpdated',
-      headerName: t('fuelCode:fuelCodeColLabels.lastUpdated'),
-      maxWidth: 180,
-      minWidth: 180,
-      cellRenderer: (params) => (
-        <Typography variant="body4">
-          {params.value ? `${params.value} PDT` : 'YYYY-MM-DD'}
-        </Typography>
-      ),
-      editable: false, // TODO: change as per #516
-      cellDataType: 'text',
-      // valueGetter: (params) => {
-      //   return new Date().toLocaleDateString()
-      // },
-      hide: isDraftOrNew
-    },
-    {
-      field: 'applicationDate',
-      headerComponent: isDraftOrNew ? RequiredHeader : undefined,
-      headerName: t('fuelCode:fuelCodeColLabels.applicationDate'),
-      maxWidth: 180,
-      minWidth: 180,
-      cellRenderer: (params) => (
-        <Typography variant="body4">
-          {params.value ? params.value : 'YYYY-MM-DD'}
-        </Typography>
-      ),
-      suppressKeyboardEvent: (params) =>
-        params.editing &&
-        (params.event.key === KEY_ENTER || params.event.key === KEY_TAB),
-      cellStyle: (params) => {
-        if (params.data.modified && (!params.value || params.value === ''))
-          return { borderColor: 'red' }
-      },
-      cellEditor: 'dateEditor',
-      editable: isDraftOrNew
-    },
-    {
-      field: 'approvalDate',
-      headerName: t('fuelCode:fuelCodeColLabels.approvalDate'),
-      maxWidth: 180,
-      minWidth: 180,
-      cellRenderer: (params) => (
-        <Typography variant="body4">
-          {params.value ? params.value : 'YYYY-MM-DD'}
-        </Typography>
-      ),
-      suppressKeyboardEvent: (params) => params.editing,
-      cellEditor: 'dateEditor'
-    },
-    {
-      field: 'effectiveDate',
-      headerName: t('fuelCode:fuelCodeColLabels.effectiveDate'),
-      maxWidth: 180,
-      minWidth: 180,
-      cellRenderer: (params) => (
-        <Typography variant="body4">
-          {params.value ? params.value : 'YYYY-MM-DD'}
-        </Typography>
-      ),
-      suppressKeyboardEvent: (params) => params.editing,
-      cellEditor: 'dateEditor',
-      editable: isDraftOrNew
-    },
-    {
-      field: 'expirationDate',
-      headerName: t('fuelCode:fuelCodeColLabels.expiryDate'),
-      maxWidth: 180,
-      minWidth: 180,
-      cellRenderer: (params) => (
-        <Typography variant="body4">
-          {params.value ? params.value : 'YYYY-MM-DD'}
-        </Typography>
-      ),
-      suppressKeyboardEvent: (params) => params.editing,
-      cellEditor: 'dateEditor',
-      editable: isDraftOrNew
-    },
-    {
-      field: 'fuel',
-      headerComponent: isDraftOrNew ? RequiredHeader : undefined,
-      headerName: t('fuelCode:fuelCodeColLabels.fuel'),
-      cellEditor: AutocompleteCellEditor,
-      cellRenderer: (params) =>
-        params.value ||
-        (!params.value && <Typography variant="body4">Select</Typography>),
-      cellEditorParams: {
-        options: optionsData.fuelTypes
-          .filter((fuel) => !fuel.fossilDerived)
-          .map((obj) => obj.fuelType),
-        multiple: false, // ability to select multiple values from dropdown
-        disableCloseOnSelect: false, // if multiple is true, this will prevent closing dropdown on selecting an option
-        freeSolo: false, // this will allow user to type in the input box or choose from the dropdown
-        openOnFocus: true // this will open the dropdown on input focus
-      },
-      suppressKeyboardEvent: (params) => {
-        // return true (to suppress) if editing and user hit Enter key
-        return params.editing && params.event.key === KEY_ENTER
-      },
-      cellStyle: (params) => {
-        if (params.data.modified && (!params.value || params.value === ''))
-          return { borderColor: 'red' }
-      },
-      minWidth: 300,
-      editable: isDraftOrNew
-    },
-    {
-      field: 'feedstock',
-      headerComponent: isDraftOrNew ? RequiredHeader : undefined,
-      headerName: t('fuelCode:fuelCodeColLabels.feedstock'),
-      cellEditor: 'agTextCellEditor',
-      cellDataType: 'text',
-      cellStyle: (params) => {
-        if (params.data.modified && (!params.value || params.value === ''))
-          return { borderColor: 'red' }
-      },
-      minWidth: 300,
-      editable: isDraftOrNew
-    },
-    {
-      field: 'feedstockLocation',
-      headerComponent: isDraftOrNew ? RequiredHeader : undefined,
-      headerName: t('fuelCode:fuelCodeColLabels.feedstockLocation'),
-      cellEditor: 'agTextCellEditor',
-      cellDataType: 'text',
-      cellStyle: (params) => {
-        if (params.data.modified && (!params.value || params.value === ''))
-          return { borderColor: 'red' }
-      },
-      minWidth: 300,
-      editable: isDraftOrNew
-    },
-    {
-      field: 'feedstockMisc',
-      headerName: t('fuelCode:fuelCodeColLabels.misc'),
-      cellEditor: 'agTextCellEditor',
-      cellDataType: 'text',
-      minWidth: 495,
-      editable: isDraftOrNew
-    },
-    {
-      field: 'fuelProductionFacilityCity',
-      headerComponent: isDraftOrNew ? RequiredHeader : undefined,
-      headerName: t('fuelCode:fuelCodeColLabels.fuelProductionFacilityCity'),
-      cellEditor: AutocompleteCellEditor,
-      cellDataType: 'text',
-      cellStyle: (params) => {
-        if (params.data.modified && (!params.value || params.value === ''))
-          return { borderColor: 'red' }
-      },
-      cellRenderer: (params) =>
-        params.value ||
-        (!params.value && <Typography variant="body4">Select</Typography>),
-      cellEditorParams: {
-        onDynamicUpdate: (val, params) => params.api.stopEditing(),
-        noLabel: true,
-        options: [
-          ...new Map(
-            optionsData.fpLocations.map((location) => [
-              location.fuelProductionFacilityCity,
-              location.fuelProductionFacilityCity
-            ])
-          ).values()
-        ],
-        multiple: false, // ability to select multiple values from dropdown
-        disableCloseOnSelect: false, // if multiple is true, this will prevent closing dropdown on selecting an option
-        freeSolo: true, // this will allow user to type in the input box or choose from the dropdown
-        openOnFocus: true // this will open the dropdown on input focus
-      },
-      minWidth: 325 // TODO: handle in #486
-    },
-    {
-      field: 'fuelProductionFacilityProvinceState',
-      headerComponent: isDraftOrNew ? RequiredHeader : undefined,
-      headerName: t(
-        'fuelCode:fuelCodeColLabels.fuelProductionFacilityProvinceState'
-      ),
-      cellEditor: AutocompleteCellEditor,
-      cellDataType: 'text',
-      cellStyle: (params) => {
-        if (params.data.modified && (!params.value || params.value === ''))
-          return { borderColor: 'red' }
-      },
-      cellRenderer: (params) =>
-        params.value ||
-        (!params.value && <Typography variant="body4">Select</Typography>),
-      cellEditorParams: {
-        onDynamicUpdate: (val, params) => params.api.stopEditing(),
-        noLabel: true,
-        options: [
-          ...new Map(
-            optionsData.fpLocations.map((location) => [
-              location.fuelProductionFacilityProvinceState,
-              location.fuelProductionFacilityProvinceState
-            ])
-          ).values()
-        ],
-        multiple: false, // ability to select multiple values from dropdown
-        disableCloseOnSelect: false, // if multiple is true, this will prevent closing dropdown on selecting an option
-        freeSolo: true, // this will allow user to type in the input box or choose from the dropdown
-        openOnFocus: true // this will open the dropdown on input focus
-      },
-      minWidth: 325 // TODO: handle in #486
-    },
-    {
-      field: 'fuelProductionFacilityCountry',
-      headerComponent: isDraftOrNew ? RequiredHeader : undefined,
-      headerName: t('fuelCode:fuelCodeColLabels.fuelProductionFacilityCountry'),
-      cellEditor: AutocompleteCellEditor,
-      cellDataType: 'text',
-      cellStyle: (params) => {
-        if (params.data.modified && (!params.value || params.value === ''))
-          return { borderColor: 'red' }
-      },
-      cellRenderer: (params) =>
-        params.value ||
-        (!params.value && <Typography variant="body4">Select</Typography>),
-      cellEditorParams: {
-        noLabel: true,
-        options: [
-          ...new Map(
-            optionsData.fpLocations.map((location) => [
-              location.fuelProductionFacilityCountry,
-              location.fuelProductionFacilityCountry
-            ])
-          ).values()
-        ],
-        multiple: false, // ability to select multiple values from dropdown
-        disableCloseOnSelect: false, // if multiple is true, this will prevent closing dropdown on selecting an option
-        freeSolo: true, // this will allow user to type in the input box or choose from the dropdown
-        openOnFocus: true // this will open the dropdown on input focus
-      },
-      minWidth: 325 // TODO: handle in #486
-    },
-    {
-      field: 'facilityNameplateCapacity',
-      headerName: t('fuelCode:fuelCodeColLabels.facilityNameplateCapacity'),
-      cellEditor: NumberEditor,
-      type: 'numericColumn',
-      valueFormatter: numberFormatter,
-      cellEditorParams: {
-        precision: 0,
-        min: 0,
-        showStepperButtons: false
-      },
-      minWidth: 290,
-      editable: isDraftOrNew
-    },
-    {
-      field: 'facilityNameplateCapacityUnit',
-      headerName: t('fuelCode:fuelCodeColLabels.facilityNameplateCapacityUnit'),
-      cellEditor: AutocompleteCellEditor,
-      cellRenderer: (params) =>
-        params.value ||
-        (!params.value && <Typography variant="body4">Select</Typography>),
-      cellEditorParams: {
-        options: optionsData.facilityNameplateCapacityUnits,
-        multiple: false, // ability to select multiple values from dropdown
-        disableCloseOnSelect: false, // if multiple is true, this will prevent closing dropdown on selecting an option
-        freeSolo: false, // this will allow user to type in the input box or choose from the dropdown
-        openOnFocus: true // this will open the dropdown on input focus
-      },
-      suppressKeyboardEvent: (params) => {
-        // return true (to suppress) if editing and user hit Enter key
-        return params.editing && params.event.key === KEY_ENTER
-      },
-      cellStyle: (params) => {
-        if (params.data.modified && (!params.value || params.value === ''))
-          return { borderColor: 'red' }
-      },
-      minWidth: 300,
-      editable: isDraftOrNew
-    },
-    {
-      field: 'feedstockFuelTransportMode',
-      headerName: t('fuelCode:fuelCodeColLabels.feedstockFuelTransportMode'),
-      cellEditor: AutocompleteCellEditor,
-      cellRenderer: (params) =>
-        params.value ? (
-          <CommonArrayRenderer {...params} />
-        ) : (
-          <Typography variant="body4">Select</Typography>
-        ),
-      cellRendererParams: {
-        disableLink: true
-      },
-      cellEditorParams: {
-        options: optionsData.transportModes.map((obj) => obj.transportMode),
-        multiple: true,
-        openOnFocus: true,
-        disableCloseOnSelect: true
-      },
-      suppressKeyboardEvent: (params) => params.editing,
-      minWidth: 325,
-      editable: isDraftOrNew
-    },
-    {
-      field: 'finishedFuelTransportMode',
-      headerName: t('fuelCode:fuelCodeColLabels.finishedFuelTransportMode'),
-      cellEditor: AutocompleteCellEditor,
-      cellRenderer: (params) =>
-        params.value ? (
-          <CommonArrayRenderer {...params} />
-        ) : (
-          <Typography variant="body4">Select</Typography>
-        ),
-      cellRendererParams: {
-        disableLink: true
-      },
-      cellEditorParams: {
-        options: optionsData.transportModes.map((obj) => obj.transportMode),
-        multiple: true,
-        openOnFocus: true,
-        disableCloseOnSelect: true
-      },
-      suppressKeyboardEvent: (params) => params.editing,
-      minWidth: 325,
-      editable: isDraftOrNew
-    },
-    {
-      field: 'formerCompany',
-      headerName: t('fuelCode:fuelCodeColLabels.formerCompany'),
-      cellEditor: 'agTextCellEditor',
-      cellDataType: 'text',
-      minWidth: 300,
-      editable: isDraftOrNew
-    },
-    {
-      field: 'notes',
-      headerName: t('fuelCode:fuelCodeColLabels.notes'),
-      cellEditor: 'agTextCellEditor',
-      cellDataType: 'text',
-      minWidth: 600,
-      editable: isDraftOrNew
-    }
-  ],
-
-  defaultColDef: {
-    editable: true,
-    resizable: true,
-    filter: true,
-    floatingFilter: false,
-    sortable: false,
-    singleClickEdit: true
-  }
-}
diff --git a/frontend/src/views/Organizations/ViewOrganization/_schema.js b/frontend/src/views/Organizations/ViewOrganization/_schema.js
index 4c053a038..bc1a33fb8 100644
--- a/frontend/src/views/Organizations/ViewOrganization/_schema.js
+++ b/frontend/src/views/Organizations/ViewOrganization/_schema.js
@@ -49,7 +49,6 @@ export const organizationsColDefs = (t) => [
     cellRenderer: OrgStatusRenderer,
     cellClass: 'vertical-middle',
     floatingFilterComponent: BCColumnSetFilter,
-    suppressFloatingFilterButton: true,
     floatingFilterComponentParams: {
       apiOptionField: 'status',
       apiQuery: useOrganizationStatuses,