diff --git a/Console/BExIS.Web.Shell/Areas/DCM/Controllers/FormController.cs b/Console/BExIS.Web.Shell/Areas/DCM/Controllers/FormController.cs
index 09690afcb1..0a8c78e507 100644
--- a/Console/BExIS.Web.Shell/Areas/DCM/Controllers/FormController.cs
+++ b/Console/BExIS.Web.Shell/Areas/DCM/Controllers/FormController.cs
@@ -3076,6 +3076,22 @@ public ActionResult ValidateMetadataParameterUsage(string value, int id, long at
 
             ViewData["Xpath"] = stepModelHelper.XPath; // set Xpath for idbyxapth
 
+            // store in stephelper
+            if (stepModelHelper.Model.MetadataAttributeModels.Any()) // check if metadata Attribute models exist
+            { 
+                var metadataAttributeModel = stepModelHelper.Model.MetadataAttributeModels.Where(m=>m.Source.Id.Equals(attrUsageId) && m.Number.Equals((long)number)).FirstOrDefault();// get metadata attribute model for this parameter
+                if (metadataAttributeModel != null)
+                { 
+                    if(metadataAttributeModel.Parameters.Any())
+                    {
+                        // get stored parameter model and replace it
+                        var storedParameterModel = metadataAttributeModel.Parameters.Where(p => p.Id.Equals(model.Id)).FirstOrDefault();
+                        storedParameterModel.Value = model.Value;
+                        storedParameterModel.Errors = validateParameter(model);
+                    }
+                }
+            }
+
             return PartialView("_metadataParameterView", model);
         }
 
diff --git a/Console/BExIS.Web.Shell/Areas/DIM/Helpers/DimSeedDataGenerator.cs b/Console/BExIS.Web.Shell/Areas/DIM/Helpers/DimSeedDataGenerator.cs
index 9c3806849c..8b91f7c96b 100644
--- a/Console/BExIS.Web.Shell/Areas/DIM/Helpers/DimSeedDataGenerator.cs
+++ b/Console/BExIS.Web.Shell/Areas/DIM/Helpers/DimSeedDataGenerator.cs
@@ -178,8 +178,6 @@ private void createDOIMappingConcept()
                 var creator = conceptManager.CreateMappingKey("Creator", "", "www.google.de",false,true,concept);
                 var firstname = conceptManager.CreateMappingKey("Firstname", "", "", false, false, concept,creator);
                 var lastname = conceptManager.CreateMappingKey("Lastname", "", "", false, false, concept, creator);
-
-
             }
         }
 
diff --git a/Console/BExIS.Web.Shell/Areas/DIM/Helpers/MappingHelper.cs b/Console/BExIS.Web.Shell/Areas/DIM/Helpers/MappingHelper.cs
index d914c31bcf..45e80f7129 100644
--- a/Console/BExIS.Web.Shell/Areas/DIM/Helpers/MappingHelper.cs
+++ b/Console/BExIS.Web.Shell/Areas/DIM/Helpers/MappingHelper.cs
@@ -37,18 +37,18 @@ public static List<LinkElementRootListItem> LoadSelectionList()
                 tmp.Add(li);
 
                 //load Metadata Strutcure
-                IEnumerable<MetadataStructure> metadataStructures = metadataStructureManager.Repo.Get();
-
-                foreach (var metadataStructure in metadataStructures)
-                {
-                    li = new LinkElementRootListItem(
-                        metadataStructure.Id,
-                        metadataStructure.Name,
-                        LinkElementType.MetadataStructure
-                        );
-
-                    tmp.Add(li);
-                }
+                //IEnumerable<MetadataStructure> metadataStructures = metadataStructureManager.Repo.Get();
+
+                //foreach (var metadataStructure in metadataStructures)
+                //{
+                //    li = new LinkElementRootListItem(
+                //        metadataStructure.Id,
+                //        metadataStructure.Name,
+                //        LinkElementType.MetadataStructure
+                //        );
+
+                //    tmp.Add(li);
+                //}
 
                 // add concepts
                 using (var conceptManager = new ConceptManager())