[#291] Fix for custom fields
Merge pull request #302 from akvo/feature/291_incremental_updates

Code reviewed.