diff --git a/src/baseexpression.h b/src/baseexpression.h
index 872b6b2..5a829d4 100644
--- a/src/baseexpression.h
+++ b/src/baseexpression.h
@@ -337,16 +337,7 @@ protected:
 					field_value_list_separator();
 				}
 
-				//ModelEnv model_env_local(*model_env);
-				//m.model_env = &model_env_local;
-				//before_field_value(field_value);
-				//m.set_connector(model_connector);
-
 				put_field_value(m);
-
-				//generate_from_model(m);
-				//m.model_env = nullptr;
-				//after_field_value(field_value);
 				is_first = false;
 			}
 
@@ -372,11 +363,12 @@ protected:
 
 				ModelEnv model_env_local(*model_env);
 				m.model_env = &model_env_local;
-				//before_field_value(field_value);
+				m.model_env->has_primary_key_set = m.get_has_primary_key_set();
 				m.set_connector(model_connector);
+
 				generate_from_model(m);
+
 				m.model_env = nullptr;
-				//after_field_value(field_value);
 				is_first = false;
 			}
 
diff --git a/src/modelenv.h b/src/modelenv.h
index 9cb6047..dae9625 100644
--- a/src/modelenv.h
+++ b/src/modelenv.h
@@ -84,12 +84,8 @@ public:
 
 	ModelEnv(const ModelEnv & e)
 	{
-		model_data = e.model_data;
-		finder_helper = e.finder_helper;
-		cursor_helper = e.cursor_helper;
-		model_work_mode = e.model_work_mode;
-		model_work_submode = e.model_work_submode;
-		dump_mode = e.dump_mode;
+		copy_global_objects(e);
+
 		table_index = e.table_index;
 		set_field_name_helper = e.set_field_name_helper;
 		field_value_helper_tab = e.field_value_helper_tab;