diff --git a/gui/tests/env.js b/gui/tests/env.js
index 0c8ccdb22158d65df1c719988df6775ca85ee7f8..9941d2c1f5384bf31d29767c463111922148c7e0 100644
--- a/gui/tests/env.js
+++ b/gui/tests/env.js
@@ -3091,109 +3091,30 @@ window.nomadEnv = {
           "name": "simulationworkflowschema",
           "description": "This is a collection of schemas for various types of simulation workflows.\n"
         },
-        "perovskite_solar_cell_database:perovskite_solar_cell": {
-          "id": "perovskite_solar_cell_database:perovskite_solar_cell",
-          "entry_point_type": "schema_package",
-          "name": "PerovskiteSolarCell",
-          "description": "Schema package defined for the perovskite solar cells database.",
-          "plugin_package": "perovskite_solar_cell_database"
-        },
-        "perovskite_solar_cell_database.apps:solar_cells": {
-          "id": "perovskite_solar_cell_database.apps:solar_cells",
+        "nomad_porous_materials.apps:mofapp": {
+          "id": "nomad_porous_materials.apps:mofapp",
           "entry_point_type": "app",
-          "name": "Solar Cells",
-          "description": "\n      This app allows you to search **solar cell data** within NOMAD. The filter\n      menu on the left and the shown default columns are specifically designed\n      for solar cell exploration. The dashboard directly shows useful\n      interactive statistics about the data.\n    ",
-          "plugin_package": "perovskite_solar_cell_database",
+          "name": "MOF",
+          "description": "App defined using the new plugin mechanism.",
+          "plugin_package": "nomad_porous_materials",
           "app": {
-            "label": "Solar Cells",
-            "path": "solarcells",
+            "label": "Metal-Organic Frameworks",
+            "path": "mofs",
             "resource": "entries",
             "category": "Use Cases",
-            "description": "Search solar cells",
-            "readme": "This page allows you to search **solar cell data** within NOMAD. The filter menu on the left and the shown default columns are specifically designed for solar cell exploration. The dashboard directly shows useful interactive statistics about the data.",
+            "description": "Search metal-organic frameworks (MOFs)",
+            "readme": "\n            This page allows you to search **metal-organic framework\n            (MOF) data** within NOMAD. The filter menu on the left\n            and the shown default columns are specifically designed\n            for MOF exploration. The dashboard directly shows useful\n            interactive statistics about the data.",
             "pagination": {
-              "order_by": "results.properties.optoelectronic.solar_cell.efficiency",
+              "order_by": "upload_create_time",
               "order": "desc",
               "page_size": 20
             },
             "columns": {
               "options": {
-                "results.material.chemical_formula_descriptive": {
-                  "label": "Descriptive formula",
-                  "align": "left"
-                },
-                "results.properties.optoelectronic.solar_cell.efficiency": {
-                  "label": "Efficiency (%)",
-                  "align": "left",
-                  "format": {
-                    "decimals": 2,
-                    "mode": "standard"
-                  }
-                },
-                "results.properties.optoelectronic.solar_cell.open_circuit_voltage": {
-                  "align": "left",
-                  "unit": "V",
-                  "format": {
-                    "decimals": 3,
-                    "mode": "standard"
-                  }
-                },
-                "results.properties.optoelectronic.solar_cell.short_circuit_current_density": {
-                  "align": "left",
-                  "unit": "A/m**2",
-                  "format": {
-                    "decimals": 3,
-                    "mode": "standard"
-                  }
-                },
-                "results.properties.optoelectronic.solar_cell.fill_factor": {
-                  "align": "left",
-                  "format": {
-                    "decimals": 3,
-                    "mode": "standard"
-                  }
-                },
-                "references": {
-                  "align": "left"
-                },
-                "results.material.chemical_formula_hill": {
+                "results.material.chemical_formula_iupac": {
                   "label": "Formula",
                   "align": "left"
                 },
-                "results.material.structural_type": {
-                  "align": "left"
-                },
-                "results.properties.optoelectronic.solar_cell.illumination_intensity": {
-                  "label": "Illum. intensity",
-                  "align": "left",
-                  "unit": "W/m**2",
-                  "format": {
-                    "decimals": 3,
-                    "mode": "standard"
-                  }
-                },
-                "results.eln.lab_ids": {
-                  "align": "left"
-                },
-                "results.eln.sections": {
-                  "align": "left"
-                },
-                "results.eln.methods": {
-                  "align": "left"
-                },
-                "results.eln.tags": {
-                  "align": "left"
-                },
-                "results.eln.instruments": {
-                  "align": "left"
-                },
-                "entry_name": {
-                  "label": "Name",
-                  "align": "left"
-                },
-                "entry_type": {
-                  "align": "left"
-                },
                 "mainfile": {
                   "align": "left"
                 },
@@ -3216,12 +3137,9 @@ window.nomadEnv = {
                 }
               },
               "selected": [
-                "results.material.chemical_formula_descriptive",
-                "results.properties.optoelectronic.solar_cell.efficiency",
-                "results.properties.optoelectronic.solar_cell.open_circuit_voltage",
-                "results.properties.optoelectronic.solar_cell.short_circuit_current_density",
-                "results.properties.optoelectronic.solar_cell.fill_factor",
-                "references"
+                "results.material.chemical_formula_iupac",
+                "mainfile",
+                "authors"
               ]
             },
             "rows": {
@@ -3238,7 +3156,7 @@ window.nomadEnv = {
             "filter_menus": {
               "options": {
                 "material": {
-                  "label": "Absorber Material",
+                  "label": "Material",
                   "level": 0,
                   "size": "s"
                 },
@@ -3248,7 +3166,7 @@ window.nomadEnv = {
                   "size": "xl"
                 },
                 "structure": {
-                  "label": "Structure / Symmetry",
+                  "label": "Structure",
                   "level": 1,
                   "size": "s"
                 },
@@ -3257,21 +3175,6 @@ window.nomadEnv = {
                   "level": 0,
                   "size": "s"
                 },
-                "solarcell": {
-                  "label": "Solar Cell Properties",
-                  "level": 0,
-                  "size": "s"
-                },
-                "eln": {
-                  "label": "Electronic Lab Notebook",
-                  "level": 0,
-                  "size": "s"
-                },
-                "custom_quantities": {
-                  "label": "User Defined Quantities",
-                  "level": 0,
-                  "size": "l"
-                },
                 "author": {
                   "label": "Author / Origin / Dataset",
                   "level": 0,
@@ -3290,9 +3193,6 @@ window.nomadEnv = {
               }
             },
             "filters": {
-              "include": [
-                "*#perovskite_solar_cell_database.schema.PerovskiteSolarCell"
-              ],
               "exclude": [
                 "mainfile",
                 "entry_name",
@@ -3305,469 +3205,310 @@ window.nomadEnv = {
                   "type": "periodictable",
                   "layout": {
                     "lg": {
-                      "h": 8,
-                      "w": 12,
+                      "h": 9,
+                      "w": 15,
                       "x": 0,
                       "y": 0,
-                      "minH": 8,
-                      "minW": 12
+                      "minH": 3,
+                      "minW": 3
                     },
                     "md": {
                       "h": 8,
-                      "w": 12,
+                      "w": 11,
                       "x": 0,
                       "y": 0,
-                      "minH": 8,
-                      "minW": 12
+                      "minH": 3,
+                      "minW": 3
                     },
                     "sm": {
-                      "h": 8,
-                      "w": 12,
+                      "h": 6,
+                      "w": 9,
                       "x": 0,
-                      "y": 16,
-                      "minH": 8,
-                      "minW": 12
+                      "y": 0,
+                      "minH": 3,
+                      "minW": 3
                     },
                     "xl": {
-                      "h": 8,
-                      "w": 12,
+                      "h": 9,
+                      "w": 19,
                       "x": 0,
                       "y": 0,
-                      "minH": 8,
-                      "minW": 12
+                      "minH": 3,
+                      "minW": 3
                     },
                     "xxl": {
-                      "h": 8,
-                      "w": 13,
+                      "h": 10,
+                      "w": 25,
                       "x": 0,
                       "y": 0,
-                      "minH": 8,
-                      "minW": 12
+                      "minH": 3,
+                      "minW": 3
                     }
                   },
                   "quantity": "results.material.elements",
                   "scale": "linear"
                 },
                 {
-                  "type": "scatterplot",
+                  "title": "SBU type",
+                  "type": "terms",
                   "layout": {
                     "lg": {
-                      "h": 6,
-                      "w": 12,
-                      "x": 0,
-                      "y": 8,
+                      "h": 9,
+                      "w": 9,
+                      "x": 15,
+                      "y": 0,
                       "minH": 3,
                       "minW": 3
                     },
                     "md": {
-                      "h": 6,
-                      "w": 9,
-                      "x": 0,
-                      "y": 8,
+                      "h": 8,
+                      "w": 7,
+                      "x": 11,
+                      "y": 0,
                       "minH": 3,
                       "minW": 3
                     },
                     "sm": {
-                      "h": 5,
-                      "w": 6,
-                      "x": 0,
+                      "h": 6,
+                      "w": 3,
+                      "x": 9,
                       "y": 0,
                       "minH": 3,
                       "minW": 3
                     },
                     "xl": {
-                      "h": 8,
-                      "w": 9,
-                      "x": 12,
+                      "h": 9,
+                      "w": 11,
+                      "x": 19,
                       "y": 0,
                       "minH": 3,
                       "minW": 3
                     },
                     "xxl": {
-                      "h": 8,
-                      "w": 12,
-                      "x": 24,
+                      "h": 10,
+                      "w": 11,
+                      "x": 25,
                       "y": 0,
                       "minH": 3,
                       "minW": 3
                     }
                   },
-                  "x": {
-                    "quantity": "results.properties.optoelectronic.solar_cell.open_circuit_voltage"
-                  },
-                  "y": {
-                    "title": "Efficiency (%)",
-                    "quantity": "results.properties.optoelectronic.solar_cell.efficiency"
-                  },
-                  "markers": {
-                    "color": {
-                      "unit": "mA/cm^2",
-                      "quantity": "results.properties.optoelectronic.solar_cell.short_circuit_current_density"
-                    }
-                  },
-                  "size": 1000,
-                  "autorange": true
+                  "quantity": "results.material.topology.sbu_type",
+                  "scale": "linear",
+                  "showinput": true
                 },
                 {
-                  "type": "scatterplot",
+                  "type": "histogram",
                   "layout": {
                     "lg": {
-                      "h": 6,
+                      "h": 5,
                       "w": 12,
                       "x": 0,
-                      "y": 14,
+                      "y": 9,
                       "minH": 3,
                       "minW": 3
                     },
                     "md": {
-                      "h": 6,
+                      "h": 4,
                       "w": 9,
-                      "x": 9,
+                      "x": 0,
                       "y": 8,
                       "minH": 3,
                       "minW": 3
                     },
                     "sm": {
-                      "h": 5,
+                      "h": 3,
                       "w": 6,
-                      "x": 6,
-                      "y": 0,
+                      "x": 0,
+                      "y": 6,
                       "minH": 3,
                       "minW": 3
                     },
                     "xl": {
-                      "h": 8,
-                      "w": 9,
-                      "x": 21,
-                      "y": 0,
+                      "h": 5,
+                      "w": 15,
+                      "x": 0,
+                      "y": 9,
                       "minH": 3,
                       "minW": 3
                     },
                     "xxl": {
-                      "h": 8,
-                      "w": 11,
-                      "x": 13,
-                      "y": 0,
-                      "minH": 3,
-                      "minW": 3
-                    }
-                  },
-                  "x": {
-                    "quantity": "results.properties.optoelectronic.solar_cell.open_circuit_voltage"
-                  },
-                  "y": {
-                    "title": "Efficiency (%)",
-                    "quantity": "results.properties.optoelectronic.solar_cell.efficiency"
-                  },
-                  "markers": {
-                    "color": {
-                      "quantity": "results.properties.optoelectronic.solar_cell.device_architecture"
-                    }
-                  },
-                  "size": 1000,
-                  "autorange": true
-                },
-                {
-                  "type": "terms",
-                  "layout": {
-                    "lg": {
-                      "h": 6,
-                      "w": 6,
-                      "x": 12,
-                      "y": 0,
-                      "minH": 3,
-                      "minW": 3
-                    },
-                    "md": {
-                      "h": 4,
-                      "w": 6,
-                      "x": 12,
-                      "y": 4,
-                      "minH": 3,
-                      "minW": 3
-                    },
-                    "sm": {
                       "h": 6,
-                      "w": 4,
+                      "w": 19,
                       "x": 0,
                       "y": 10,
                       "minH": 3,
                       "minW": 3
-                    },
-                    "xl": {
-                      "h": 6,
-                      "w": 6,
-                      "x": 14,
-                      "y": 8,
-                      "minH": 3,
-                      "minW": 3
-                    },
-                    "xxl": {
-                      "h": 6,
-                      "w": 6,
-                      "x": 14,
-                      "y": 8,
-                      "minH": 3,
-                      "minW": 3
                     }
                   },
-                  "quantity": "results.properties.optoelectronic.solar_cell.device_stack",
+                  "x": {
+                    "quantity": "results.material.topology.pore_limiting_diameter"
+                  },
                   "scale": "linear",
-                  "showinput": true
+                  "autorange": true,
+                  "showinput": true,
+                  "nbins": 30
                 },
                 {
                   "type": "histogram",
                   "layout": {
                     "lg": {
-                      "h": 4,
+                      "h": 5,
                       "w": 12,
-                      "x": 12,
-                      "y": 12,
+                      "x": 0,
+                      "y": 14,
                       "minH": 3,
                       "minW": 3
                     },
                     "md": {
-                      "h": 3,
-                      "w": 8,
-                      "x": 10,
-                      "y": 17,
+                      "h": 4,
+                      "w": 9,
+                      "x": 9,
+                      "y": 8,
                       "minH": 3,
                       "minW": 3
                     },
                     "sm": {
                       "h": 3,
-                      "w": 8,
-                      "x": 4,
-                      "y": 13,
+                      "w": 6,
+                      "x": 6,
+                      "y": 6,
                       "minH": 3,
                       "minW": 3
                     },
                     "xl": {
-                      "h": 3,
-                      "w": 8,
+                      "h": 5,
+                      "w": 15,
                       "x": 0,
-                      "y": 11,
+                      "y": 14,
                       "minH": 3,
                       "minW": 3
                     },
                     "xxl": {
-                      "h": 3,
-                      "w": 8,
-                      "x": 0,
-                      "y": 8,
+                      "h": 6,
+                      "w": 17,
+                      "x": 19,
+                      "y": 10,
                       "minH": 3,
                       "minW": 3
                     }
                   },
                   "x": {
-                    "quantity": "results.properties.optoelectronic.solar_cell.illumination_intensity"
+                    "quantity": "results.material.topology.largest_cavity_diameter"
                   },
-                  "scale": "1/4",
+                  "scale": "linear",
                   "autorange": true,
                   "showinput": true,
                   "nbins": 30
                 },
                 {
-                  "type": "terms",
+                  "type": "histogram",
                   "layout": {
                     "lg": {
-                      "h": 6,
-                      "w": 6,
-                      "x": 18,
-                      "y": 0,
+                      "h": 5,
+                      "w": 12,
+                      "x": 11,
+                      "y": 9,
                       "minH": 3,
                       "minW": 3
                     },
                     "md": {
                       "h": 4,
-                      "w": 6,
-                      "x": 12,
-                      "y": 0,
+                      "w": 9,
+                      "x": 0,
+                      "y": 12,
                       "minH": 3,
                       "minW": 3
                     },
                     "sm": {
-                      "h": 5,
-                      "w": 4,
+                      "h": 3,
+                      "w": 6,
                       "x": 0,
-                      "y": 5,
+                      "y": 9,
                       "minH": 3,
                       "minW": 3
                     },
                     "xl": {
-                      "h": 6,
-                      "w": 6,
-                      "x": 8,
-                      "y": 8,
+                      "h": 5,
+                      "w": 15,
+                      "x": 15,
+                      "y": 9,
                       "minH": 3,
                       "minW": 3
                     },
                     "xxl": {
                       "h": 6,
-                      "w": 6,
-                      "x": 8,
-                      "y": 8,
+                      "w": 19,
+                      "x": 0,
+                      "y": 16,
                       "minH": 3,
                       "minW": 3
                     }
                   },
-                  "quantity": "results.properties.optoelectronic.solar_cell.absorber_fabrication",
+                  "x": {
+                    "quantity": "results.material.topology.accessible_surface_area"
+                  },
                   "scale": "linear",
-                  "showinput": true
+                  "autorange": true,
+                  "showinput": true,
+                  "nbins": 30
                 },
                 {
-                  "title": "Band gap",
                   "type": "histogram",
                   "layout": {
                     "lg": {
-                      "h": 4,
+                      "h": 5,
                       "w": 12,
-                      "x": 12,
-                      "y": 16,
-                      "minH": 3,
-                      "minW": 8
-                    },
-                    "md": {
-                      "h": 3,
-                      "w": 8,
-                      "x": 10,
+                      "x": 11,
                       "y": 14,
                       "minH": 3,
-                      "minW": 8
-                    },
-                    "sm": {
-                      "h": 3,
-                      "w": 8,
-                      "x": 4,
-                      "y": 10,
-                      "minH": 3,
-                      "minW": 8
-                    },
-                    "xl": {
-                      "h": 3,
-                      "w": 8,
-                      "x": 0,
-                      "y": 8,
-                      "minH": 3,
-                      "minW": 8
-                    },
-                    "xxl": {
-                      "h": 3,
-                      "w": 8,
-                      "x": 0,
-                      "y": 11,
-                      "minH": 3,
-                      "minW": 8
-                    }
-                  },
-                  "x": {
-                    "quantity": "results.properties.electronic.band_structure_electronic.band_gap.value"
-                  },
-                  "scale": "1/4",
-                  "autorange": false,
-                  "showinput": false,
-                  "nbins": 30
-                },
-                {
-                  "type": "terms",
-                  "layout": {
-                    "lg": {
-                      "h": 6,
-                      "w": 6,
-                      "x": 18,
-                      "y": 6,
-                      "minH": 3,
                       "minW": 3
                     },
                     "md": {
-                      "h": 6,
-                      "w": 5,
-                      "x": 0,
-                      "y": 14,
+                      "h": 4,
+                      "w": 9,
+                      "x": 9,
+                      "y": 12,
                       "minH": 3,
                       "minW": 3
                     },
                     "sm": {
-                      "h": 5,
-                      "w": 4,
-                      "x": 4,
-                      "y": 5,
-                      "minH": 3,
-                      "minW": 3
-                    },
-                    "xl": {
-                      "h": 6,
-                      "w": 5,
-                      "x": 25,
-                      "y": 8,
-                      "minH": 3,
-                      "minW": 3
-                    },
-                    "xxl": {
-                      "h": 6,
-                      "w": 6,
-                      "x": 20,
-                      "y": 8,
-                      "minH": 3,
-                      "minW": 3
-                    }
-                  },
-                  "quantity": "results.properties.optoelectronic.solar_cell.electron_transport_layer",
-                  "scale": "linear",
-                  "showinput": true
-                },
-                {
-                  "type": "terms",
-                  "layout": {
-                    "lg": {
-                      "h": 6,
+                      "h": 3,
                       "w": 6,
-                      "x": 12,
-                      "y": 6,
-                      "minH": 3,
-                      "minW": 3
-                    },
-                    "md": {
-                      "h": 6,
-                      "w": 5,
-                      "x": 5,
-                      "y": 14,
-                      "minH": 3,
-                      "minW": 3
-                    },
-                    "sm": {
-                      "h": 5,
-                      "w": 4,
-                      "x": 8,
-                      "y": 5,
+                      "x": 6,
+                      "y": 9,
                       "minH": 3,
                       "minW": 3
                     },
                     "xl": {
-                      "h": 6,
-                      "w": 5,
-                      "x": 20,
-                      "y": 8,
+                      "h": 5,
+                      "w": 15,
+                      "x": 15,
+                      "y": 14,
                       "minH": 3,
                       "minW": 3
                     },
                     "xxl": {
                       "h": 6,
-                      "w": 6,
-                      "x": 26,
-                      "y": 8,
+                      "w": 17,
+                      "x": 19,
+                      "y": 16,
                       "minH": 3,
                       "minW": 3
                     }
                   },
-                  "quantity": "results.properties.optoelectronic.solar_cell.hole_transport_layer",
+                  "x": {
+                    "quantity": "results.material.topology.void_fraction"
+                  },
                   "scale": "linear",
-                  "showinput": true
+                  "autorange": true,
+                  "showinput": true,
+                  "nbins": 30
                 }
               ]
             },
             "filters_locked": {
-              "sections": "nomad.datamodel.results.SolarCell"
+              "results.material.topology.label": "MOF"
             },
             "search_syntaxes": {
               "exclude": [
@@ -3776,30 +3517,116 @@ window.nomadEnv = {
             }
           }
         },
-        "nomad_porous_materials.apps:mofapp": {
-          "id": "nomad_porous_materials.apps:mofapp",
+        "nomad_porous_materials.normalizers:porositynormalizer": {
+          "id": "nomad_porous_materials.normalizers:porositynormalizer",
+          "entry_point_type": "normalizer",
+          "name": "PorosityNormalizer",
+          "description": "\n        Normalizer that automatically extracts properties from porous\n        materials.\n    ",
+          "plugin_package": "nomad_porous_materials"
+        },
+        "perovskite_solar_cell_database:perovskite_solar_cell": {
+          "id": "perovskite_solar_cell_database:perovskite_solar_cell",
+          "entry_point_type": "schema_package",
+          "name": "PerovskiteSolarCell",
+          "description": "Schema package defined for the perovskite solar cells database.",
+          "plugin_package": "perovskite_solar_cell_database"
+        },
+        "perovskite_solar_cell_database.apps:solar_cells": {
+          "id": "perovskite_solar_cell_database.apps:solar_cells",
           "entry_point_type": "app",
-          "name": "MOF",
-          "description": "App defined using the new plugin mechanism.",
-          "plugin_package": "nomad_porous_materials",
+          "name": "Solar Cells",
+          "description": "\n      This app allows you to search **solar cell data** within NOMAD. The filter\n      menu on the left and the shown default columns are specifically designed\n      for solar cell exploration. The dashboard directly shows useful\n      interactive statistics about the data.\n    ",
+          "plugin_package": "perovskite_solar_cell_database",
           "app": {
-            "label": "Metal-Organic Frameworks",
-            "path": "mofs",
+            "label": "Solar Cells",
+            "path": "solarcells",
             "resource": "entries",
             "category": "Use Cases",
-            "description": "Search metal-organic frameworks (MOFs)",
-            "readme": "\n            This page allows you to search **metal-organic framework\n            (MOF) data** within NOMAD. The filter menu on the left\n            and the shown default columns are specifically designed\n            for MOF exploration. The dashboard directly shows useful\n            interactive statistics about the data.",
+            "description": "Search solar cells",
+            "readme": "This page allows you to search **solar cell data** within NOMAD. The filter menu on the left and the shown default columns are specifically designed for solar cell exploration. The dashboard directly shows useful interactive statistics about the data.",
             "pagination": {
-              "order_by": "upload_create_time",
+              "order_by": "results.properties.optoelectronic.solar_cell.efficiency",
               "order": "desc",
               "page_size": 20
             },
             "columns": {
               "options": {
-                "results.material.chemical_formula_iupac": {
+                "results.material.chemical_formula_descriptive": {
+                  "label": "Descriptive formula",
+                  "align": "left"
+                },
+                "results.properties.optoelectronic.solar_cell.efficiency": {
+                  "label": "Efficiency (%)",
+                  "align": "left",
+                  "format": {
+                    "decimals": 2,
+                    "mode": "standard"
+                  }
+                },
+                "results.properties.optoelectronic.solar_cell.open_circuit_voltage": {
+                  "align": "left",
+                  "unit": "V",
+                  "format": {
+                    "decimals": 3,
+                    "mode": "standard"
+                  }
+                },
+                "results.properties.optoelectronic.solar_cell.short_circuit_current_density": {
+                  "align": "left",
+                  "unit": "A/m**2",
+                  "format": {
+                    "decimals": 3,
+                    "mode": "standard"
+                  }
+                },
+                "results.properties.optoelectronic.solar_cell.fill_factor": {
+                  "align": "left",
+                  "format": {
+                    "decimals": 3,
+                    "mode": "standard"
+                  }
+                },
+                "references": {
+                  "align": "left"
+                },
+                "results.material.chemical_formula_hill": {
                   "label": "Formula",
                   "align": "left"
                 },
+                "results.material.structural_type": {
+                  "align": "left"
+                },
+                "results.properties.optoelectronic.solar_cell.illumination_intensity": {
+                  "label": "Illum. intensity",
+                  "align": "left",
+                  "unit": "W/m**2",
+                  "format": {
+                    "decimals": 3,
+                    "mode": "standard"
+                  }
+                },
+                "results.eln.lab_ids": {
+                  "align": "left"
+                },
+                "results.eln.sections": {
+                  "align": "left"
+                },
+                "results.eln.methods": {
+                  "align": "left"
+                },
+                "results.eln.tags": {
+                  "align": "left"
+                },
+                "results.eln.instruments": {
+                  "align": "left"
+                },
+                "entry_name": {
+                  "label": "Name",
+                  "align": "left"
+                },
+                "entry_type": {
+                  "align": "left"
+                },
                 "mainfile": {
                   "align": "left"
                 },
@@ -3822,9 +3649,12 @@ window.nomadEnv = {
                 }
               },
               "selected": [
-                "results.material.chemical_formula_iupac",
-                "mainfile",
-                "authors"
+                "results.material.chemical_formula_descriptive",
+                "results.properties.optoelectronic.solar_cell.efficiency",
+                "results.properties.optoelectronic.solar_cell.open_circuit_voltage",
+                "results.properties.optoelectronic.solar_cell.short_circuit_current_density",
+                "results.properties.optoelectronic.solar_cell.fill_factor",
+                "references"
               ]
             },
             "rows": {
@@ -3841,7 +3671,7 @@ window.nomadEnv = {
             "filter_menus": {
               "options": {
                 "material": {
-                  "label": "Material",
+                  "label": "Absorber Material",
                   "level": 0,
                   "size": "s"
                 },
@@ -3851,7 +3681,7 @@ window.nomadEnv = {
                   "size": "xl"
                 },
                 "structure": {
-                  "label": "Structure",
+                  "label": "Structure / Symmetry",
                   "level": 1,
                   "size": "s"
                 },
@@ -3860,6 +3690,21 @@ window.nomadEnv = {
                   "level": 0,
                   "size": "s"
                 },
+                "solarcell": {
+                  "label": "Solar Cell Properties",
+                  "level": 0,
+                  "size": "s"
+                },
+                "eln": {
+                  "label": "Electronic Lab Notebook",
+                  "level": 0,
+                  "size": "s"
+                },
+                "custom_quantities": {
+                  "label": "User Defined Quantities",
+                  "level": 0,
+                  "size": "l"
+                },
                 "author": {
                   "label": "Author / Origin / Dataset",
                   "level": 0,
@@ -3878,6 +3723,9 @@ window.nomadEnv = {
               }
             },
             "filters": {
+              "include": [
+                "*#perovskite_solar_cell_database.schema.PerovskiteSolarCell"
+              ],
               "exclude": [
                 "mainfile",
                 "entry_name",
@@ -3890,310 +3738,469 @@ window.nomadEnv = {
                   "type": "periodictable",
                   "layout": {
                     "lg": {
-                      "h": 9,
-                      "w": 15,
+                      "h": 8,
+                      "w": 12,
                       "x": 0,
                       "y": 0,
-                      "minH": 3,
-                      "minW": 3
+                      "minH": 8,
+                      "minW": 12
                     },
                     "md": {
                       "h": 8,
-                      "w": 11,
+                      "w": 12,
+                      "x": 0,
+                      "y": 0,
+                      "minH": 8,
+                      "minW": 12
+                    },
+                    "sm": {
+                      "h": 8,
+                      "w": 12,
+                      "x": 0,
+                      "y": 16,
+                      "minH": 8,
+                      "minW": 12
+                    },
+                    "xl": {
+                      "h": 8,
+                      "w": 12,
+                      "x": 0,
+                      "y": 0,
+                      "minH": 8,
+                      "minW": 12
+                    },
+                    "xxl": {
+                      "h": 8,
+                      "w": 13,
                       "x": 0,
                       "y": 0,
+                      "minH": 8,
+                      "minW": 12
+                    }
+                  },
+                  "quantity": "results.material.elements",
+                  "scale": "linear"
+                },
+                {
+                  "type": "scatterplot",
+                  "layout": {
+                    "lg": {
+                      "h": 6,
+                      "w": 12,
+                      "x": 0,
+                      "y": 8,
                       "minH": 3,
                       "minW": 3
                     },
-                    "sm": {
+                    "md": {
                       "h": 6,
                       "w": 9,
                       "x": 0,
+                      "y": 8,
+                      "minH": 3,
+                      "minW": 3
+                    },
+                    "sm": {
+                      "h": 5,
+                      "w": 6,
+                      "x": 0,
                       "y": 0,
                       "minH": 3,
                       "minW": 3
                     },
                     "xl": {
-                      "h": 9,
-                      "w": 19,
-                      "x": 0,
+                      "h": 8,
+                      "w": 9,
+                      "x": 12,
                       "y": 0,
                       "minH": 3,
                       "minW": 3
                     },
                     "xxl": {
-                      "h": 10,
-                      "w": 25,
-                      "x": 0,
+                      "h": 8,
+                      "w": 12,
+                      "x": 24,
                       "y": 0,
                       "minH": 3,
                       "minW": 3
                     }
                   },
-                  "quantity": "results.material.elements",
-                  "scale": "linear"
+                  "x": {
+                    "quantity": "results.properties.optoelectronic.solar_cell.open_circuit_voltage"
+                  },
+                  "y": {
+                    "title": "Efficiency (%)",
+                    "quantity": "results.properties.optoelectronic.solar_cell.efficiency"
+                  },
+                  "markers": {
+                    "color": {
+                      "unit": "mA/cm^2",
+                      "quantity": "results.properties.optoelectronic.solar_cell.short_circuit_current_density"
+                    }
+                  },
+                  "size": 1000,
+                  "autorange": true
                 },
                 {
-                  "title": "SBU type",
-                  "type": "terms",
+                  "type": "scatterplot",
                   "layout": {
                     "lg": {
-                      "h": 9,
+                      "h": 6,
+                      "w": 12,
+                      "x": 0,
+                      "y": 14,
+                      "minH": 3,
+                      "minW": 3
+                    },
+                    "md": {
+                      "h": 6,
                       "w": 9,
-                      "x": 15,
+                      "x": 9,
+                      "y": 8,
+                      "minH": 3,
+                      "minW": 3
+                    },
+                    "sm": {
+                      "h": 5,
+                      "w": 6,
+                      "x": 6,
                       "y": 0,
                       "minH": 3,
                       "minW": 3
                     },
-                    "md": {
+                    "xl": {
                       "h": 8,
-                      "w": 7,
-                      "x": 11,
+                      "w": 9,
+                      "x": 21,
                       "y": 0,
                       "minH": 3,
                       "minW": 3
                     },
-                    "sm": {
+                    "xxl": {
+                      "h": 8,
+                      "w": 11,
+                      "x": 13,
+                      "y": 0,
+                      "minH": 3,
+                      "minW": 3
+                    }
+                  },
+                  "x": {
+                    "quantity": "results.properties.optoelectronic.solar_cell.open_circuit_voltage"
+                  },
+                  "y": {
+                    "title": "Efficiency (%)",
+                    "quantity": "results.properties.optoelectronic.solar_cell.efficiency"
+                  },
+                  "markers": {
+                    "color": {
+                      "quantity": "results.properties.optoelectronic.solar_cell.device_architecture"
+                    }
+                  },
+                  "size": 1000,
+                  "autorange": true
+                },
+                {
+                  "type": "terms",
+                  "layout": {
+                    "lg": {
                       "h": 6,
-                      "w": 3,
-                      "x": 9,
+                      "w": 6,
+                      "x": 12,
                       "y": 0,
                       "minH": 3,
                       "minW": 3
                     },
+                    "md": {
+                      "h": 4,
+                      "w": 6,
+                      "x": 12,
+                      "y": 4,
+                      "minH": 3,
+                      "minW": 3
+                    },
+                    "sm": {
+                      "h": 6,
+                      "w": 4,
+                      "x": 0,
+                      "y": 10,
+                      "minH": 3,
+                      "minW": 3
+                    },
+                    "xl": {
+                      "h": 6,
+                      "w": 6,
+                      "x": 14,
+                      "y": 8,
+                      "minH": 3,
+                      "minW": 3
+                    },
+                    "xxl": {
+                      "h": 6,
+                      "w": 6,
+                      "x": 14,
+                      "y": 8,
+                      "minH": 3,
+                      "minW": 3
+                    }
+                  },
+                  "quantity": "results.properties.optoelectronic.solar_cell.device_stack",
+                  "scale": "linear",
+                  "showinput": true
+                },
+                {
+                  "type": "histogram",
+                  "layout": {
+                    "lg": {
+                      "h": 4,
+                      "w": 12,
+                      "x": 12,
+                      "y": 12,
+                      "minH": 3,
+                      "minW": 3
+                    },
+                    "md": {
+                      "h": 3,
+                      "w": 8,
+                      "x": 10,
+                      "y": 17,
+                      "minH": 3,
+                      "minW": 3
+                    },
+                    "sm": {
+                      "h": 3,
+                      "w": 8,
+                      "x": 4,
+                      "y": 13,
+                      "minH": 3,
+                      "minW": 3
+                    },
                     "xl": {
-                      "h": 9,
-                      "w": 11,
-                      "x": 19,
-                      "y": 0,
+                      "h": 3,
+                      "w": 8,
+                      "x": 0,
+                      "y": 11,
                       "minH": 3,
                       "minW": 3
                     },
                     "xxl": {
-                      "h": 10,
-                      "w": 11,
-                      "x": 25,
-                      "y": 0,
+                      "h": 3,
+                      "w": 8,
+                      "x": 0,
+                      "y": 8,
                       "minH": 3,
                       "minW": 3
                     }
                   },
-                  "quantity": "results.material.topology.sbu_type",
-                  "scale": "linear",
-                  "showinput": true
+                  "x": {
+                    "quantity": "results.properties.optoelectronic.solar_cell.illumination_intensity"
+                  },
+                  "scale": "1/4",
+                  "autorange": true,
+                  "showinput": true,
+                  "nbins": 30
                 },
                 {
-                  "type": "histogram",
+                  "type": "terms",
                   "layout": {
                     "lg": {
-                      "h": 5,
-                      "w": 12,
-                      "x": 0,
-                      "y": 9,
+                      "h": 6,
+                      "w": 6,
+                      "x": 18,
+                      "y": 0,
                       "minH": 3,
                       "minW": 3
                     },
                     "md": {
                       "h": 4,
-                      "w": 9,
-                      "x": 0,
-                      "y": 8,
+                      "w": 6,
+                      "x": 12,
+                      "y": 0,
                       "minH": 3,
                       "minW": 3
                     },
                     "sm": {
-                      "h": 3,
-                      "w": 6,
+                      "h": 5,
+                      "w": 4,
                       "x": 0,
-                      "y": 6,
+                      "y": 5,
                       "minH": 3,
                       "minW": 3
                     },
                     "xl": {
-                      "h": 5,
-                      "w": 15,
-                      "x": 0,
-                      "y": 9,
+                      "h": 6,
+                      "w": 6,
+                      "x": 8,
+                      "y": 8,
                       "minH": 3,
                       "minW": 3
                     },
                     "xxl": {
                       "h": 6,
-                      "w": 19,
-                      "x": 0,
-                      "y": 10,
+                      "w": 6,
+                      "x": 8,
+                      "y": 8,
                       "minH": 3,
                       "minW": 3
                     }
                   },
-                  "x": {
-                    "quantity": "results.material.topology.pore_limiting_diameter"
-                  },
+                  "quantity": "results.properties.optoelectronic.solar_cell.absorber_fabrication",
                   "scale": "linear",
-                  "autorange": true,
-                  "showinput": true,
-                  "nbins": 30
+                  "showinput": true
                 },
                 {
+                  "title": "Band gap",
                   "type": "histogram",
                   "layout": {
                     "lg": {
-                      "h": 5,
+                      "h": 4,
                       "w": 12,
-                      "x": 0,
-                      "y": 14,
+                      "x": 12,
+                      "y": 16,
                       "minH": 3,
-                      "minW": 3
+                      "minW": 8
                     },
                     "md": {
-                      "h": 4,
-                      "w": 9,
-                      "x": 9,
-                      "y": 8,
+                      "h": 3,
+                      "w": 8,
+                      "x": 10,
+                      "y": 14,
                       "minH": 3,
-                      "minW": 3
+                      "minW": 8
                     },
                     "sm": {
                       "h": 3,
-                      "w": 6,
-                      "x": 6,
-                      "y": 6,
+                      "w": 8,
+                      "x": 4,
+                      "y": 10,
                       "minH": 3,
-                      "minW": 3
+                      "minW": 8
                     },
                     "xl": {
-                      "h": 5,
-                      "w": 15,
+                      "h": 3,
+                      "w": 8,
                       "x": 0,
-                      "y": 14,
+                      "y": 8,
                       "minH": 3,
-                      "minW": 3
+                      "minW": 8
                     },
                     "xxl": {
-                      "h": 6,
-                      "w": 17,
-                      "x": 19,
-                      "y": 10,
+                      "h": 3,
+                      "w": 8,
+                      "x": 0,
+                      "y": 11,
                       "minH": 3,
-                      "minW": 3
+                      "minW": 8
                     }
                   },
                   "x": {
-                    "quantity": "results.material.topology.largest_cavity_diameter"
+                    "quantity": "results.properties.electronic.band_structure_electronic.band_gap.value"
                   },
-                  "scale": "linear",
-                  "autorange": true,
-                  "showinput": true,
+                  "scale": "1/4",
+                  "autorange": false,
+                  "showinput": false,
                   "nbins": 30
                 },
                 {
-                  "type": "histogram",
+                  "type": "terms",
                   "layout": {
                     "lg": {
-                      "h": 5,
-                      "w": 12,
-                      "x": 11,
-                      "y": 9,
+                      "h": 6,
+                      "w": 6,
+                      "x": 18,
+                      "y": 6,
                       "minH": 3,
                       "minW": 3
                     },
                     "md": {
-                      "h": 4,
-                      "w": 9,
+                      "h": 6,
+                      "w": 5,
                       "x": 0,
-                      "y": 12,
+                      "y": 14,
                       "minH": 3,
                       "minW": 3
                     },
                     "sm": {
-                      "h": 3,
-                      "w": 6,
-                      "x": 0,
-                      "y": 9,
+                      "h": 5,
+                      "w": 4,
+                      "x": 4,
+                      "y": 5,
                       "minH": 3,
                       "minW": 3
                     },
                     "xl": {
-                      "h": 5,
-                      "w": 15,
-                      "x": 15,
-                      "y": 9,
+                      "h": 6,
+                      "w": 5,
+                      "x": 25,
+                      "y": 8,
                       "minH": 3,
                       "minW": 3
                     },
                     "xxl": {
                       "h": 6,
-                      "w": 19,
-                      "x": 0,
-                      "y": 16,
+                      "w": 6,
+                      "x": 20,
+                      "y": 8,
                       "minH": 3,
                       "minW": 3
                     }
                   },
-                  "x": {
-                    "quantity": "results.material.topology.accessible_surface_area"
-                  },
+                  "quantity": "results.properties.optoelectronic.solar_cell.electron_transport_layer",
                   "scale": "linear",
-                  "autorange": true,
-                  "showinput": true,
-                  "nbins": 30
+                  "showinput": true
                 },
                 {
-                  "type": "histogram",
+                  "type": "terms",
                   "layout": {
                     "lg": {
-                      "h": 5,
-                      "w": 12,
-                      "x": 11,
-                      "y": 14,
+                      "h": 6,
+                      "w": 6,
+                      "x": 12,
+                      "y": 6,
                       "minH": 3,
                       "minW": 3
                     },
                     "md": {
-                      "h": 4,
-                      "w": 9,
-                      "x": 9,
-                      "y": 12,
+                      "h": 6,
+                      "w": 5,
+                      "x": 5,
+                      "y": 14,
                       "minH": 3,
                       "minW": 3
                     },
                     "sm": {
-                      "h": 3,
-                      "w": 6,
-                      "x": 6,
-                      "y": 9,
+                      "h": 5,
+                      "w": 4,
+                      "x": 8,
+                      "y": 5,
                       "minH": 3,
                       "minW": 3
                     },
                     "xl": {
-                      "h": 5,
-                      "w": 15,
-                      "x": 15,
-                      "y": 14,
+                      "h": 6,
+                      "w": 5,
+                      "x": 20,
+                      "y": 8,
                       "minH": 3,
                       "minW": 3
                     },
                     "xxl": {
                       "h": 6,
-                      "w": 17,
-                      "x": 19,
-                      "y": 16,
+                      "w": 6,
+                      "x": 26,
+                      "y": 8,
                       "minH": 3,
                       "minW": 3
                     }
                   },
-                  "x": {
-                    "quantity": "results.material.topology.void_fraction"
-                  },
+                  "quantity": "results.properties.optoelectronic.solar_cell.hole_transport_layer",
                   "scale": "linear",
-                  "autorange": true,
-                  "showinput": true,
-                  "nbins": 30
+                  "showinput": true
                 }
               ]
             },
             "filters_locked": {
-              "results.material.topology.label": "MOF"
+              "sections": "nomad.datamodel.results.SolarCell"
             },
             "search_syntaxes": {
               "exclude": [
@@ -4201,29 +4208,10 @@ window.nomadEnv = {
               ]
             }
           }
-        },
-        "nomad_porous_materials.normalizers:porositynormalizer": {
-          "id": "nomad_porous_materials.normalizers:porositynormalizer",
-          "entry_point_type": "normalizer",
-          "name": "PorosityNormalizer",
-          "description": "\n        Normalizer that automatically extracts properties from porous\n        materials.\n    ",
-          "plugin_package": "nomad_porous_materials"
         }
       }
     },
     "plugin_packages": {
-      "perovskite_solar_cell_database": {
-        "name": "perovskite_solar_cell_database",
-        "description": "Perovskite solar cell data schema plugin for NOMAD.",
-        "version": "0.0.0",
-        "homepage": "https://github.com/FAIRmat-NFDI/nomad-perovskite-solar-cells-database",
-        "documentation": null,
-        "repository": "https://github.com/FAIRmat-NFDI/nomad-perovskite-solar-cells-database",
-        "entry_points": [
-          "perovskite_solar_cell_database:perovskite_solar_cell",
-          "perovskite_solar_cell_database.apps:solar_cells"
-        ]
-      },
       "nomad_porous_materials": {
         "name": "nomad_porous_materials",
         "description": "NOMAD plugin for porous materials",
@@ -4235,6 +4223,18 @@ window.nomadEnv = {
           "nomad_porous_materials.apps:mofapp",
           "nomad_porous_materials.normalizers:porositynormalizer"
         ]
+      },
+      "perovskite_solar_cell_database": {
+        "name": "perovskite_solar_cell_database",
+        "description": "Perovskite solar cell data schema plugin for NOMAD.",
+        "version": "0.0.0",
+        "homepage": "https://github.com/FAIRmat-NFDI/nomad-perovskite-solar-cells-database",
+        "documentation": null,
+        "repository": "https://github.com/FAIRmat-NFDI/nomad-perovskite-solar-cells-database",
+        "entry_points": [
+          "perovskite_solar_cell_database:perovskite_solar_cell",
+          "perovskite_solar_cell_database.apps:solar_cells"
+        ]
       }
     }
   }