Changed the update functionality to so that it now returns an entity that reflects the values in the database for the whole record even with selective updates
merged up some changes