diff --git a/NzbDrone.Core.Test/Datastore/ObjectDatabaseFixture.cs b/NzbDrone.Core.Test/Datastore/ObjectDatabaseFixture.cs
index 6b9cf9d2d..ad84f1078 100644
--- a/NzbDrone.Core.Test/Datastore/ObjectDatabaseFixture.cs
+++ b/NzbDrone.Core.Test/Datastore/ObjectDatabaseFixture.cs
@@ -101,7 +101,7 @@ namespace NzbDrone.Core.Test.Datastore
 
 
         [Test]
-        public void update_field_should_only_update_that_filed()
+        public void set_fields_should_only_update_selected_filed()
         {
             var childModel = new JobDefinition
                 {
@@ -117,14 +117,12 @@ namespace NzbDrone.Core.Test.Datastore
             childModel.Name = "B";
             childModel.Interval = 0;
 
-            Subject.UpdateFields(childModel, t => t.Name);
+            Subject.SetFields(childModel, t => t.Name);
 
             Db.All<JobDefinition>().Single().Type.Should().Be("Address");
             Db.All<JobDefinition>().Single().Name.Should().Be("B");
             Db.All<JobDefinition>().Single().Interval.Should().Be(12);
         }
-
-
     }
 
 }
diff --git a/NzbDrone.Core/Datastore/BasicRepository.cs b/NzbDrone.Core/Datastore/BasicRepository.cs
index 1d6e47a26..02147daa2 100644
--- a/NzbDrone.Core/Datastore/BasicRepository.cs
+++ b/NzbDrone.Core/Datastore/BasicRepository.cs
@@ -26,7 +26,7 @@ namespace NzbDrone.Core.Datastore
         void Purge();
         bool HasItems();
         void DeleteMany(IEnumerable<int> ids);
-        void UpdateFields<TKey>(TModel model, Expression<Func<TModel, TKey>> onlyFields);
+        void SetFields(TModel model, params Expression<Func<TModel, object>>[] properties);
     }
 
     public class BasicRepository<TModel> : IBasicRepository<TModel> where TModel : ModelBase, new()
@@ -148,16 +148,19 @@ namespace NzbDrone.Core.Datastore
             return Count() > 0;
         }
 
-        public void UpdateFields<TKey>(TModel model, Expression<Func<TModel, TKey>> onlyFields)
+        public void SetFields(TModel model, params Expression<Func<TModel, object>>[] properties)
         {
             if (model.Id == 0)
             {
                 throw new InvalidOperationException("Attempted to updated model without ID");
             }
 
-            _dataMapper.Update<TModel>(model, m => m.Id == model.Id);
-
-            // _database.UpdateOnly(model, onlyFields, m => m.Id == model.Id);
+            _dataMapper.Update<TModel>()
+                .Where(c => c.Id == model.Id)
+                .ColumnsIncluding(properties)
+                .Entity(model)
+                .Execute();
         }
+
     }
 }
diff --git a/NzbDrone.Core/Tv/EpisodeRepository.cs b/NzbDrone.Core/Tv/EpisodeRepository.cs
index 80b0d5073..e66a1adbe 100644
Binary files a/NzbDrone.Core/Tv/EpisodeRepository.cs and b/NzbDrone.Core/Tv/EpisodeRepository.cs differ
diff --git a/NzbDrone.Core/Tv/SeriesRepository.cs b/NzbDrone.Core/Tv/SeriesRepository.cs
index c7b2b0170..cf9b0bd6f 100644
--- a/NzbDrone.Core/Tv/SeriesRepository.cs
+++ b/NzbDrone.Core/Tv/SeriesRepository.cs
@@ -43,7 +43,7 @@ namespace NzbDrone.Core.Tv
 
         public void SetSeriesType(int seriesId, SeriesTypes seriesType)
         {
-            UpdateFields(new Series { Id = seriesId, SeriesType = seriesType }, s => s.SeriesType);
+            SetFields(new Series { Id = seriesId, SeriesType = seriesType }, s => s.SeriesType);
         }
     }
 }
\ No newline at end of file