Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Dialogs/HydraulicBoundaryDatabaseImporterSettingsDialog.cs
===================================================================
diff -u -r61e866499b1e74d5bacd20a770a84454115343dc -re846c5a124b38dfbd2ebd2b51a1b26e2b2caf100
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Dialogs/HydraulicBoundaryDatabaseImporterSettingsDialog.cs	(.../HydraulicBoundaryDatabaseImporterSettingsDialog.cs)	(revision 61e866499b1e74d5bacd20a770a84454115343dc)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Dialogs/HydraulicBoundaryDatabaseImporterSettingsDialog.cs	(.../HydraulicBoundaryDatabaseImporterSettingsDialog.cs)	(revision e846c5a124b38dfbd2ebd2b51a1b26e2b2caf100)
@@ -24,6 +24,7 @@
 using System.Windows.Forms;
 using Core.Common.Controls.Dialogs;
 using Core.Common.Gui.Helpers;
+using Core.Common.Util;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Integration.Forms.Properties;
 using Riskeer.Integration.IO.Importers;
@@ -146,7 +147,9 @@
 
         private void OnButtonHlcdClick(object sender, EventArgs e)
         {
-            string sourceFileLocation = inquiryHelper.GetSourceFileLocation(Resources.HydraulicBoundaryDatabaseImporterSettingsDialog_FileFilter_Hlcd);
+            string sourceFileLocation = inquiryHelper.GetSourceFileLocation(
+                new FileFilterGenerator(Resources.HydraulicBoundaryDatabaseImporterSettingsDialog_FileFilterGenerator_extension_sqlite,
+                                        Resources.HydraulicBoundaryDatabaseImporterSettingsDialog_FileFilterGenerator_description_hlcd).Filter);
 
             if (sourceFileLocation != null)
             {
@@ -170,7 +173,9 @@
 
         private void OnButtonLocationsClick(object sender, EventArgs e)
         {
-            string sourceFileLocation = inquiryHelper.GetSourceFileLocation(Resources.HydraulicBoundaryDatabaseImporterSettingsDialog_FileFilter_Locations);
+            string sourceFileLocation = inquiryHelper.GetSourceFileLocation(
+                new FileFilterGenerator(Resources.HydraulicBoundaryDatabaseImporterSettingsDialog_FileFilterGenerator_extension_sqlite,
+                                        Resources.HydraulicBoundaryDatabaseImporterSettingsDialog_FileFilterGenerator_description_locations).Filter);
 
             if (sourceFileLocation != null)
             {
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rb6e94550df721ce41b9f524f01bc04cbbfe3fffb -re846c5a124b38dfbd2ebd2b51a1b26e2b2caf100
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision b6e94550df721ce41b9f524f01bc04cbbfe3fffb)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision e846c5a124b38dfbd2ebd2b51a1b26e2b2caf100)
@@ -707,24 +707,36 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to HLCD bestand|*.sqlite.
+        ///   Looks up a localized string similar to HLCD bestand.
         /// </summary>
-        public static string HydraulicBoundaryDatabaseImporterSettingsDialog_FileFilter_Hlcd {
+        public static string HydraulicBoundaryDatabaseImporterSettingsDialog_FileFilterGenerator_description_hlcd {
             get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabaseImporterSettingsDialog_FileFilter_Hlcd", resourceCulture);
+                return ResourceManager.GetString("HydraulicBoundaryDatabaseImporterSettingsDialog_FileFilterGenerator_description_h" +
+                        "lcd", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Locatie bestand|*.sqlite.
+        ///   Looks up a localized string similar to Locatie bestand.
         /// </summary>
-        public static string HydraulicBoundaryDatabaseImporterSettingsDialog_FileFilter_Locations {
+        public static string HydraulicBoundaryDatabaseImporterSettingsDialog_FileFilterGenerator_description_locations {
             get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabaseImporterSettingsDialog_FileFilter_Locations", resourceCulture);
+                return ResourceManager.GetString("HydraulicBoundaryDatabaseImporterSettingsDialog_FileFilterGenerator_description_l" +
+                        "ocations", resourceCulture);
             }
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to sqlite.
+        /// </summary>
+        public static string HydraulicBoundaryDatabaseImporterSettingsDialog_FileFilterGenerator_extension_sqlite {
+            get {
+                return ResourceManager.GetString("HydraulicBoundaryDatabaseImporterSettingsDialog_FileFilterGenerator_extension_sql" +
+                        "ite", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Korte toelichting bij HLCD bestand..
         /// </summary>
         public static string HydraulicBoundaryDatabaseImporterSettingsDialog_Tooltip_Hlcd {
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -rb6e94550df721ce41b9f524f01bc04cbbfe3fffb -re846c5a124b38dfbd2ebd2b51a1b26e2b2caf100
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision b6e94550df721ce41b9f524f01bc04cbbfe3fffb)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision e846c5a124b38dfbd2ebd2b51a1b26e2b2caf100)
@@ -446,12 +446,6 @@
   <data name="HydraulicLocationConfigurationSettings_UsePreprocessorClosure_DisplayName" xml:space="preserve">
     <value>Gebruik preprocessor sluitregime database</value>
   </data>
-  <data name="HydraulicBoundaryDatabaseImporterSettingsDialog_FileFilter_Hlcd" xml:space="preserve">
-    <value>HLCD bestand|*.sqlite</value>
-  </data>
-  <data name="HydraulicBoundaryDatabaseImporterSettingsDialog_FileFilter_Locations" xml:space="preserve">
-    <value>Locatie bestand|*.sqlite</value>
-  </data>
   <data name="HydraulicBoundaryDatabaseImporterSettingsDialog_Tooltip_Hlcd" xml:space="preserve">
     <value>Korte toelichting bij HLCD bestand.</value>
   </data>
@@ -479,4 +473,13 @@
   <data name="HydraulicBoundaryDatabaseImporterSettingsDialog_ValidateInput_Locations_does_not_exist" xml:space="preserve">
     <value>Kan niet koppelen aan database: het geselecteerde locatie bestand bestaat niet.</value>
   </data>
+  <data name="HydraulicBoundaryDatabaseImporterSettingsDialog_FileFilterGenerator_extension_sqlite" xml:space="preserve">
+    <value>sqlite</value>
+  </data>
+  <data name="HydraulicBoundaryDatabaseImporterSettingsDialog_FileFilterGenerator_description_hlcd" xml:space="preserve">
+    <value>HLCD bestand</value>
+  </data>
+  <data name="HydraulicBoundaryDatabaseImporterSettingsDialog_FileFilterGenerator_description_locations" xml:space="preserve">
+    <value>Locatie bestand</value>
+  </data>
 </root>
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.Designer.cs
===================================================================
diff -u -r106eeb3a0608bd85eb1fcc8fff72256fd9c3ac5f -re846c5a124b38dfbd2ebd2b51a1b26e2b2caf100
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 106eeb3a0608bd85eb1fcc8fff72256fd9c3ac5f)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision e846c5a124b38dfbd2ebd2b51a1b26e2b2caf100)
@@ -322,24 +322,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Hydraulische belastingendatabase.
-        /// </summary>
-        public static string HydraulicBoundaryDatabase_file_filter_Description {
-            get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabase_file_filter_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to sqlite.
-        /// </summary>
-        public static string HydraulicBoundaryDatabase_FilePath_Extension {
-            get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabase_FilePath_Extension", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to U heeft een ander hydraulische belastingendatabase bestand geselecteerd. Als gevolg hiervan moet de uitvoer van alle ervan afhankelijke berekeningen verwijderd worden.
         ///
         ///Wilt u doorgaan?.
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.resx
===================================================================
diff -u -rdd98665ba884b1917cd943b143f5f7bfebf7429b -re846c5a124b38dfbd2ebd2b51a1b26e2b2caf100
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.resx	(.../Resources.resx)	(revision dd98665ba884b1917cd943b143f5f7bfebf7429b)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.resx	(.../Resources.resx)	(revision e846c5a124b38dfbd2ebd2b51a1b26e2b2caf100)
@@ -223,12 +223,6 @@
 
 Wilt u doorgaan?</value>
   </data>
-  <data name="HydraulicBoundaryDatabase_FilePath_Extension" xml:space="preserve">
-    <value>sqlite</value>
-  </data>
-  <data name="HydraulicBoundaryDatabase_file_filter_Description" xml:space="preserve">
-    <value>Hydraulische belastingendatabase</value>
-  </data>
   <data name="HydraulicLocationConfigurationDatabaseUpdateHandler_Confirm_clear_hydraulicLocationConfigurationDatabase_dependent_data" xml:space="preserve">
     <value>Als u het gekoppelde HLCD bestand wijzigt, zal de uitvoer van alle berekeningen verwijderd worden.
 
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -r2f7f837744fe1a898193fdae34f2891fd44bba70 -re846c5a124b38dfbd2ebd2b51a1b26e2b2caf100
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 2f7f837744fe1a898193fdae34f2891fd44bba70)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision e846c5a124b38dfbd2ebd2b51a1b26e2b2caf100)
@@ -764,11 +764,6 @@
 
             yield return new ImportInfo<HydraulicBoundaryDatabaseContext>
             {
-                Name = RiskeerCommonDataResources.HydraulicBoundaryConditions_DisplayName,
-                Image = RiskeerCommonFormsResources.DatabaseIcon,
-                Category = RiskeerCommonFormsResources.Riskeer_Category,
-                FileFilterGenerator = new FileFilterGenerator(Resources.HydraulicBoundaryDatabase_FilePath_Extension,
-                                                              Resources.HydraulicBoundaryDatabase_file_filter_Description),
                 CreateFileImporter = (context, filePath) => new HydraulicBoundaryDatabaseImporter(
                     context.WrappedData, new HydraulicBoundaryDatabaseUpdateHandler(context.AssessmentSection,
                                                                                     new DuneLocationsReplacementHandler(
@@ -2295,7 +2290,10 @@
                                                                                                                                        hydraulicBoundaryDatabase.LocationsFilePath))
                                                                              : new HydraulicBoundaryDatabaseImporterSettingsDialog(Gui.MainWindow, GetInquiryHelper());
 
-                                                            dialog.ShowDialog();
+                                                            if (dialog.ShowDialog() == DialogResult.OK)
+                                                            {
+
+                                                            }
                                                         });
 
             SetHydraulicsMenuItemEnabledStateAndTooltip(nodeData.AssessmentSection,