diff --git a/src/client/components/facet_results/ResultClassRoute.js b/src/client/components/facet_results/ResultClassRoute.js
index 626c8073ae24c68496a99308d143a00c8989e4eb..bce946117fc69f010100122b86bc41f74a0323ae 100644
--- a/src/client/components/facet_results/ResultClassRoute.js
+++ b/src/client/components/facet_results/ResultClassRoute.js
@@ -213,7 +213,9 @@ const ResultClassRoute = props => {
         seriesTitle,
         stroke,
         fill,
-        createChartData
+        createChartData,
+        doNotRenderOnMount = false,
+        dropdownForResultClasses = false
       } = resultClassConfig
       const apexProps = {
         portalConfig,
@@ -235,7 +237,14 @@ const ResultClassRoute = props => {
         seriesTitle,
         stroke,
         fill,
-        layoutConfig: props.layoutConfig
+        layoutConfig: props.layoutConfig,
+        doNotRenderOnMount,
+        dropdownForResultClasses
+      }
+      if (dropdownForResultClasses && has(resultClassConfig, 'resultClasses')) {
+        apexProps.resultClass = resultClassConfig.resultClasses[0]
+        apexProps.resultClasses = resultClassConfig.resultClasses
+        apexProps.dropdownForResultClasses = true
       }
       routeComponent = (
         <Route
diff --git a/src/client/components/main_layout/MuiIcon.js b/src/client/components/main_layout/MuiIcon.js
index 0dc5307b8ec5f2efd97d24f27810c47a6a4d60be..ea108b95244d03c6e09a6e162648deb7b911afbc 100644
--- a/src/client/components/main_layout/MuiIcon.js
+++ b/src/client/components/main_layout/MuiIcon.js
@@ -9,7 +9,8 @@ import {
   PieChart,
   CloudDownload,
   BubbleChart,
-  ShowChart
+  ShowChart,
+  FormatAlignJustify
 } from '@material-ui/icons'
 import has from 'lodash'
 
@@ -24,7 +25,8 @@ const MuiIcon = props => {
     PieChart: PieChart,
     CloudDownload: CloudDownload,
     BubbleChart: BubbleChart,
-    ShowChart: ShowChart
+    ShowChart: ShowChart,
+    FormatAlignJustify: FormatAlignJustify
   }
   if (has(MuiIcons, props.iconName)) {
     const MuiIconComponent = MuiIcons[props.iconName]
diff --git a/src/client/library_configs/Leaflet/LeafletConfig.js b/src/client/library_configs/Leaflet/LeafletConfig.js
index a69cb071ee92e1fa5d364f39891271fca0165f00..e4845aab3bd7861ea81398604efbab1af43118a7 100644
--- a/src/client/library_configs/Leaflet/LeafletConfig.js
+++ b/src/client/library_configs/Leaflet/LeafletConfig.js
@@ -14,6 +14,12 @@ export const createPopUpContentDefault = ({ data, resultClass }) => {
     link.textContent = data.prefLabel.prefLabel
     link.style.cssText = 'cursor: pointer; text-decoration: underline'
     h3.appendChild(link)
+  } else if (has(data, 'dataProviderUrl')) {
+    const link = document.createElement('a')
+    link.addEventListener('click', () => history.push(data.dataProviderUrl))
+    link.textContent = data.prefLabel.prefLabel
+    link.style.cssText = 'cursor: pointer; text-decoration: underline'
+    h3.appendChild(link)
   } else {
     h3.textContent = data.prefLabel.prefLabel
   }