FIX: if multiple updates for one entity exist, the retrieve would result in an... See merge request !57