diff --git a/app/views/branded/plans/_edit_details.html.erb b/app/views/branded/plans/_edit_details.html.erb
index 5c2b7b7..840d79e 100644
--- a/app/views/branded/plans/_edit_details.html.erb
+++ b/app/views/branded/plans/_edit_details.html.erb
@@ -1,6 +1,5 @@
 
-<%# TMP fix here + other lines (see commit) %>
-<%# persons = @plan.json_fragment().persons %>
+<% persons = @plan.json_fragment().persons %>
 <div class="row">
   <%= form_for plan, html: {method: :put, class: 'form-horizontal edit_plan' } do |f| %>
     <div class="col-md-12 plan-details">
@@ -11,7 +10,7 @@
           <h2><%= _("Plan Metadata") %></h2>
           <%= render(partial: 'plans/plan_details/plan_metadata', locals: {
                       f: f,
-                      # persons: persons
+                      persons: persons
             } ) %>
         </div>
         <!-- "Project Details" tab -->
@@ -19,7 +18,7 @@
           <h2><%= _("Project Details") %></h2>
           <%= render(partial: 'plans/plan_details/plan_project', locals: { 
                       f: f,
-                      # persons: persons
+                      persons: persons
             } ) %>
         </div>
         <!-- "Guidance Configuration" tab -->
diff --git a/app/views/branded/plans/plan_details/_linked_fragment_list.html.erb b/app/views/branded/plans/plan_details/_linked_fragment_list.html.erb
index 8678cad..ff41762 100644
--- a/app/views/branded/plans/plan_details/_linked_fragment_list.html.erb
+++ b/app/views/branded/plans/plan_details/_linked_fragment_list.html.erb
@@ -5,8 +5,6 @@
   <tr><th scope="col"><%= type.capitalize %></th><th scope="col">Actions</th></tr>
 </thead>
 <tbody>
-  <%# TMP fix (see commit) %>
-  <% obj_list = [] %>
   <% obj_list.each do |obj| %>
     <tr>
       <td><%= obj.to_s %></td>
diff --git a/app/views/branded/plans/plan_details/_plan_metadata.html.erb b/app/views/branded/plans/plan_details/_plan_metadata.html.erb
index 8fddb80..eb3aebf 100644
--- a/app/views/branded/plans/plan_details/_plan_metadata.html.erb
+++ b/app/views/branded/plans/plan_details/_plan_metadata.html.erb
@@ -1,10 +1,9 @@
 <%# locals: { persons } %>
-<%# TMP fix here + other lines (see commit) %>
-<%# meta = @plan.json_fragment().meta.data %>
-<%# contact = @plan.json_fragment().meta.contact %>
-<%# dmpID = meta["dmpID"] %>
-<%# p_version = meta["version"] %>
-<%# licence = meta["licence"] %>
+<% meta = @plan.json_fragment().meta.data %>
+<% contact = @plan.json_fragment().meta.contact %>
+<% dmpID = meta["dmpID"] %>
+<% p_version = meta["version"] %>
+<% licence = meta["licence"] %>
 
 <div class="form-group"><!-- title -->
   <div class="col-md-12">
@@ -42,16 +41,14 @@
     <div class="col-md-10">
       <%= select_tag "plan[dmpID[idType]]",
                     options_for_select(["DOI", "HANDLE", "ARK", "URL"],
-                    #selected: dmpID ? dmpID["idType"] : "DOI" 
-                    ),
+                    selected: dmpID ? dmpID["idType"] : "DOI" ),
                     class: "form-control" %>
     </div>
   </div>
   <div class="form-group"><!-- identifier -->
     <%= render(partial: 'plans/plan_details/fields/text_field', locals: {
                 f: f, 
-                #field_value: dmpID ? dmpID["value"] : nil, 
-                field_value: nil,
+                field_value: dmpID ? dmpID["value"] : nil, 
                 multiple: false,
                 field_name: "dmpID[value]", 
                 field_label: _('ID')
@@ -65,8 +62,7 @@
   <div class="form-group"><!-- versionNumber -->
     <%= render(partial: 'plans/plan_details/fields/text_field', locals: {
                 f: f, 
-                #field_value: p_version ? p_version["versionNumber"] : nil, 
-                field_value: nil,
+                field_value: p_version ? p_version["versionNumber"] : nil, 
                 multiple: false,
                 field_name: "version[versionNumber]", 
                 field_label: _('Number')
@@ -75,8 +71,7 @@
   <div class="form-group"><!-- versionNotes -->
     <%= render(partial: 'plans/plan_details/fields/text_field', locals: {
                 f: f, 
-                #field_value: p_version ? p_version["versionNotes"] : nil,  
-                field_value: nil,
+                field_value: p_version ? p_version["versionNotes"] : nil,  
                 multiple: false,
                 field_name: "version[versionNotes]", 
                 field_label: _('Notes')
@@ -87,8 +82,7 @@
 <div class="form-group"><!-- relatedDocUrl -->
     <%= render(partial: 'plans/plan_details/fields/text_field', locals: {
                 f: f, 
-                #field_value: meta["relatedDocUrl"], 
-                field_value: nil,
+                field_value: meta["relatedDocUrl"], 
                 multiple: false,
                 field_name: "relatedDocUrl", 
                 field_label: _('Related Documentation URL')
@@ -98,8 +92,7 @@
 <div class="form-group"><!-- associatedDMPId -->
     <%= render(partial: 'plans/plan_details/fields/text_field', locals: {
                 f: f, 
-                #field_value: meta["associatedDMPId"], 
-                field_value: nil,
+                field_value: meta["associatedDMPId"], 
                 multiple: false,
                 field_name: "associatedDMPId", 
                 field_label: _('Associated DMPs')
@@ -109,12 +102,9 @@
 <%= render(partial: 'shared/fragments/person_fragment_form', locals: {
             f: f,
             legend: _('Data contact person'),
-            #person: contact ? contact.data : nil,
-            person: nil,
-            #person_id: contact ? contact.id : nil,
-            person_id: nil,
-            #person_list: persons,
-            person_list: nil,
+            person: contact ? contact.data : nil,
+            person_id: contact ? contact.id : nil,
+            person_list: persons,
             plan: @plan,
             fragment_name: "contact"
       }) %>
@@ -124,8 +114,7 @@
   <div class="form-group"><!-- licenseName -->
     <%= render(partial: 'plans/plan_details/fields/text_field', locals: {
                 f: f, 
-                #field_value: licence ? licence["licenseName"] : nil,
-                field_value: nil,
+                field_value: licence ? licence["licenseName"] : nil,
                 multiple: false,
                 field_name: "licence[licenseName]", 
                 field_label: _('Name')
@@ -134,8 +123,7 @@
   <div class="form-group"><!-- licenseUrl -->
     <%= render(partial: 'plans/plan_details/fields/url_field', locals: {
                 f: f, 
-                #field_value: licence ? licence["licenseUrl"] : nil, 
-                field_value: nil,
+                field_value: licence ? licence["licenseUrl"] : nil, 
                 multiple: false,
                 field_name: "licence[licenseUrl]", 
                 field_label: _('URL')
@@ -144,8 +132,7 @@
   <div class="form-group"><!-- licenceStartDate -->
     <%= render(partial: 'plans/plan_details/fields/date_field', locals: {
                 f: f, 
-                #field_value: meta["licenceStartDate"], 
-                field_value: nil,
+                field_value: meta["licenceStartDate"], 
                 multiple: false,
                 field_name: "licenceStartDate", 
                 field_label: _('Start Date')
diff --git a/app/views/branded/plans/plan_details/_plan_project.html.erb b/app/views/branded/plans/plan_details/_plan_project.html.erb
index 69df482..feb5de3 100644
--- a/app/views/branded/plans/plan_details/_plan_project.html.erb
+++ b/app/views/branded/plans/plan_details/_plan_project.html.erb
@@ -1,17 +1,15 @@
 <%# locals: { persons } %>
 <% project_abstract_tooltip = _("Briefly summarise your research project to help others understand the purposes for which the data are being collected or created.") %>
 
-<%# TMP fix (see commit) %>
-<%# project = @plan.json_fragment().project.data %>
-<%# fundings = @plan.json_fragment().project.fundings %>
-<%# partners = @plan.json_fragment().project.partners %>
-<%# principalInvestigator = @plan.json_fragment().project.principalInvestigator %>
+<% project = @plan.json_fragment().project.data %>
+<% fundings = @plan.json_fragment().project.fundings %>
+<% partners = @plan.json_fragment().project.partners %>
+<% principalInvestigator = @plan.json_fragment().project.principalInvestigator %>
 
 <div class="form-group"><!-- project_title -->
   <%= render(partial: 'plans/plan_details/fields/text_field', locals: {
               f: f, 
-              #field_value: project["title"], 
-              field_value: nil,
+              field_value: project["title"], 
               multiple: false,
               field_name: "project_title", 
               field_label: _('Project title')
@@ -20,8 +18,7 @@
 <div class="form-group"><!-- project_acronym -->
   <%= render(partial: 'plans/plan_details/fields/text_field', locals: {
               f: f, 
-              #field_value: project["acronym"],  
-              field_value: nil,
+              field_value: project["acronym"],  
               multiple: false,
               field_name: "project_acronym", 
               field_label: _('Acronym')
@@ -30,8 +27,7 @@
 <div class="form-group"><!-- project_id -->
   <%= render(partial: 'plans/plan_details/fields/text_field', locals: {
               f: f, 
-              #field_value: project["projectId"], 
-              field_value: nil,
+              field_value: project["projectId"], 
               multiple: false,
               field_name: "project_id", 
               field_label: _('Project ID')
@@ -43,7 +39,7 @@
   </div>
   <div class="col-md-10" data-toggle="tooltip" title="<%= project_abstract_tooltip %>">
     <em class="sr-only"><%= project_abstract_tooltip %></em>
-    <%= text_area_tag "plan[project_description]", nil,
+    <%= text_area_tag "plan[project_description]", project["description"],
                         { rows: 6, class: "form-control tinymce", "aria-required": true,
                         'data-toggle': 'tooltip', spellcheck: true } %>
   </div>
@@ -52,10 +48,8 @@
 <fieldset class="project-details funding-list">
   <%= render(partial: 'plans/plan_details/linked_fragment_list', locals: {
     plan: @plan,
-    # parent_id: @plan.json_fragment().project.id,
-    parent_id: nil,
-    # obj_list: fundings,
-    obj_list: nil,
+    parent_id: @plan.json_fragment().project.id,
+    obj_list: fundings,
     type: "funding"
   }) %>
 </fieldset>
@@ -63,8 +57,7 @@
 <div class="form-group"><!-- project_start_date -->
   <%= render(partial: 'plans/plan_details/fields/date_field', locals: {
               f: f, 
-              #field_value: project["startDate"], 
-              field_value: nil,
+              field_value: project["startDate"], 
               multiple: false,
               field_name: "project_start_date", 
               field_label: _('Start Date')
@@ -73,8 +66,7 @@
 <div class="form-group"><!-- project_end_date -->
   <%= render(partial: 'plans/plan_details/fields/date_field', locals: {
               f: f, 
-              #field_value: project["endDate"], 
-              field_value: nil,
+              field_value: project["endDate"], 
               multiple: false,
               field_name: "project_end_date", 
               field_label: _('End Date')
@@ -84,10 +76,8 @@
 <fieldset class="project-details partner-list">
   <%= render(partial: 'plans/plan_details/linked_fragment_list', locals: {
     plan: @plan,
-    # parent_id: @plan.json_fragment().project.id,
-    parent_id: nil,
-    # obj_list: partners,
-    obj_list: nil,
+    parent_id: @plan.json_fragment().project.id,
+    obj_list: partners,
     type: "partner"
   }) %>
 </fieldset>
@@ -95,8 +85,7 @@
 <div class="form-group"><!-- experimental_plan_url -->
   <%= render(partial: 'plans/plan_details/fields/url_field', locals: {
               f: f, 
-              # field_value: project["experimentalPlanUrl"], 
-              field_value: nil,
+              field_value: project["experimentalPlanUrl"], 
               multiple: false,
               field_name: "experimental_plan_url", 
               field_label: _('Experimental Plan URL')
@@ -107,12 +96,9 @@
 <%= render(partial: 'shared/fragments/person_fragment_form', locals: {
             f: f,
             legend: _("Principal Investigator"),
-            # person: principalInvestigator ? principalInvestigator.data : nil,
-            person: nil,
-            # person_id: principalInvestigator ? principalInvestigator.id : nil,
-            person_id: nil,
-            # person_list: persons,
-            person_list: nil,
+            person: principalInvestigator ? principalInvestigator.data : nil,
+            person_id: principalInvestigator ? principalInvestigator.id : nil,
+            person_list: persons,
             plan: @plan,
             fragment_name: "principalInvestigator"
       }) %>
diff --git a/app/views/branded/shared/fragments/_person_fragment_form.html.erb b/app/views/branded/shared/fragments/_person_fragment_form.html.erb
index 7f1890f..92ebf15 100644
--- a/app/views/branded/shared/fragments/_person_fragment_form.html.erb
+++ b/app/views/branded/shared/fragments/_person_fragment_form.html.erb
@@ -7,8 +7,6 @@
       <%= f.label "#{fragment_name}_person_list", _('Please choose a person from the list or create a new one.'), class: 'control-label' %>
     </div>
     <div class="col-md-10">
-      <%# TMP fix (see commit) %>
-      <% person_list = [] %>
       <%= select_tag "#{fragment_name}_person_list",
                     options_for_select(
                       person_list.map { |p| [