Fixed lists of values not handled correctly by the model, fixed recursive lock during update