diff --git a/app/models/repository_date_time_range_value_base.rb b/app/models/repository_date_time_range_value_base.rb
index e8dddcc66..206bcef74 100644
--- a/app/models/repository_date_time_range_value_base.rb
+++ b/app/models/repository_date_time_range_value_base.rb
@@ -7,7 +7,7 @@ class RepositoryDateTimeRangeValueBase < ApplicationRecord
              inverse_of: :created_repository_date_time_values
   belongs_to :last_modified_by, foreign_key: :last_modified_by_id, class_name: 'User', optional: true,
              inverse_of: :modified_repository_date_time_values
-  has_one :repository_cell, as: :value, dependent: :destroy, inverse_of: :repository_date_time_value
+  has_one :repository_cell, as: :value, dependent: :destroy, inverse_of: :value
   accepts_nested_attributes_for :repository_cell
 
   validates :repository_cell, :start_time, :end_time, :type, presence: true
diff --git a/app/models/repository_status_item.rb b/app/models/repository_status_item.rb
index 0a5fef8f8..546f42841 100644
--- a/app/models/repository_status_item.rb
+++ b/app/models/repository_status_item.rb
@@ -10,4 +10,8 @@ class RepositoryStatusItem < ApplicationRecord
   belongs_to :last_modified_by, foreign_key: 'last_modified_by_id', class_name: 'User', optional: true,
              inverse_of: :modified_repository_status_types
   has_many :repository_status_values, inverse_of: :repository_status_item, dependent: :destroy
+
+  def data
+    "#{icon} #{status}"
+  end
 end
diff --git a/app/models/repository_status_value.rb b/app/models/repository_status_value.rb
index adaf72475..72b94bfae 100644
--- a/app/models/repository_status_value.rb
+++ b/app/models/repository_status_value.rb
@@ -31,12 +31,12 @@ class RepositoryStatusValue < ApplicationRecord
 
   def snapshot!(cell_snapshot)
     value_snapshot = dup
-    list_item = cell_snapshot.repository_column
+    status_item = cell_snapshot.repository_column
                              .repository_status_items
                              .find { |item| item.data == repository_status_item.data }
     value_snapshot.assign_attributes(
       repository_cell: cell_snapshot,
-      repository_status_item: list_item,
+      repository_status_item: status_item,
       created_at: created_at,
       updated_at: updated_at
     )
@@ -46,7 +46,7 @@ class RepositoryStatusValue < ApplicationRecord
   def data
     return nil unless repository_status_item
 
-    "#{repository_status_item.icon} #{repository_status_item.status}"
+    repository_status_item.data
   end
 
   def self.new_with_payload(payload, attributes)