[Chris] Changes to eav model to stop hundreds of extra sql queries being run for a save.