diff --git a/db/StoredProcedures.sql b/db/StoredProcedures.sql
index 5e9159f7c181fa3bf202013cc3cb2b67c111dbeb..b452bdd3e79d2f863401f349e2b0c9ccc209b79c 100644
--- a/db/StoredProcedures.sql
+++ b/db/StoredProcedures.sql
@@ -2002,7 +2002,8 @@ BEGIN
 	FROM `modules`
 	INNER JOIN `disciplines` ON disciplines.ID = modules.DisciplineID 
 	INNER JOIN `disciplines_teachers` ON disciplines_teachers.DisciplineID = disciplines.ID  AND disciplines_teachers.TeacherID 	= TeacherID
-	WHERE modules.ID = ModuleID
+	WHERE 	modules.ID = ModuleID AND
+			modules.isExam = 0
 	LIMIT 1;
     IF NOT (checker > 0) THEN
     	RETURN -1;
@@ -2012,7 +2013,8 @@ BEGIN
 	SELECT modules.ID 
 	INTO checker
 	FROM `modules`
-	WHERE modules.DisciplineID = checker AND modules.OrderNum = OrderNum;
+	WHERE 	modules.DisciplineID = checker AND 
+			modules.OrderNum = OrderNum;
 	IF checker > 0 THEN
 		RETURN -1;
 	END IF;
@@ -2039,15 +2041,16 @@ BEGIN
 	FROM `modules`
 	INNER JOIN `disciplines` ON disciplines.ID = modules.DisciplineID 
 	INNER JOIN `disciplines_teachers` ON disciplines_teachers.DisciplineID = disciplines.ID  AND disciplines_teachers.TeacherID 	= TeacherID
-	WHERE modules.ID = ModuleID
+	WHERE 	modules.ID = ModuleID AND
+			modules.isExam = 0
 	LIMIT 1;
     IF NOT (checker > 0) THEN
     	RETURN -1;
 	END IF;
 
 	UPDATE `modules` 
-	SET modules.Name 		= Name
-	WHERE modules.ID = ModuleID;
+	SET modules.Name = Name
+	WHERE modules.ID = ModuleID ;
 	RETURN 0;
 END //
 
@@ -2065,7 +2068,8 @@ BEGIN
 	FROM `modules`
 	INNER JOIN `disciplines` ON disciplines.ID = modules.DisciplineID 
 	INNER JOIN `disciplines_teachers` ON disciplines_teachers.DisciplineID = disciplines.ID  AND disciplines_teachers.TeacherID 	= TeacherID
-	WHERE modules.ID = ModuleID
+	WHERE 	modules.ID = ModuleID AND
+			modules.isExam = 0
 	LIMIT 1;
     IF NOT (checker > 0) THEN
     	RETURN -1;
@@ -2278,7 +2282,9 @@ BEGIN
 	FROM `modules`
 	INNER JOIN `disciplines` ON disciplines.ID = modules.DisciplineID 
 	INNER JOIN `disciplines_teachers` ON disciplines_teachers.DisciplineID = disciplines.ID  AND disciplines_teachers.TeacherID 	= TeacherID
-	WHERE modules.ID = ModuleID1 OR modules.ID = ModuleID2
+	WHERE (	modules.ID = ModuleID1 OR 
+			modules.ID = ModuleID2 ) AND
+			modules.isExam = 0
 	LIMIT 2;
 	IF checker != 2 THEN
 		RETURN -1;
@@ -2363,7 +2369,8 @@ BEGIN
 	INNER JOIN `modules` 		ON 	submodules.ModuleID 	= modules.ID
 	INNER JOIN `disciplines` 	ON 	disciplines.ID 			= modules.DisciplineID
 	INNER JOIN `disciplines_teachers` ON disciplines_teachers.DisciplineID = disciplines.ID AND disciplines_teachers.TeacherID 	= TeacherID
-	WHERE 	submodules.ID = SubmoduleID 
+	WHERE 	submodules.ID = SubmoduleID 	AND
+			modules.isExam = 0
 	LIMIT 1;
     IF NOT (checker > 0) THEN
     	RETURN -1;
@@ -2404,7 +2411,8 @@ BEGIN
 	INNER JOIN `modules` 		ON 	submodules.ModuleID 	= modules.ID
 	INNER JOIN `disciplines` 	ON 	disciplines.ID 			= modules.DisciplineID
 	INNER JOIN `disciplines_teachers` ON disciplines_teachers.DisciplineID = disciplines.ID AND disciplines_teachers.TeacherID 	= TeacherID
-	WHERE 	submodules.ID = SubmoduleID 
+	WHERE 	submodules.ID = SubmoduleID 	AND
+			modules.isExam = 0
 	LIMIT 1;
     IF NOT (checker > 0) THEN
     	RETURN -1;
@@ -2431,7 +2439,8 @@ BEGIN
 	INNER JOIN `modules` 		ON 	submodules.ModuleID 	= modules.ID
 	INNER JOIN `disciplines` 	ON 	disciplines.ID 			= modules.DisciplineID
 	INNER JOIN `disciplines_teachers` ON disciplines_teachers.DisciplineID = disciplines.ID AND disciplines_teachers.TeacherID 	= TeacherID
-	WHERE 	submodules.ID = SubmoduleID 
+	WHERE 	submodules.ID = SubmoduleID 	AND
+			modules.isExam = 0
 	LIMIT 1;
     IF NOT (checker > 0) THEN
     	RETURN -1;
@@ -2458,7 +2467,8 @@ BEGIN
 	INNER JOIN `modules` 		ON 	submodules.ModuleID 	= modules.ID
 	INNER JOIN `disciplines` 	ON 	disciplines.ID 			= modules.DisciplineID
 	INNER JOIN `disciplines_teachers` ON disciplines_teachers.DisciplineID = disciplines.ID AND disciplines_teachers.TeacherID 	= TeacherID
-	WHERE 	submodules.ID = SubmoduleID 
+	WHERE 	submodules.ID = SubmoduleID 	AND
+			modules.isExam = 0
 	LIMIT 1;
     IF NOT (checker > 0) THEN
     	RETURN -1;
@@ -2497,7 +2507,8 @@ BEGIN
 	INNER JOIN `modules` 		ON 	submodules.ModuleID 	= modules.ID
 	INNER JOIN `disciplines` 	ON 	disciplines.ID 			= modules.DisciplineID
 	INNER JOIN `disciplines_teachers` ON disciplines_teachers.DisciplineID = disciplines.ID AND disciplines_teachers.TeacherID 	= TeacherID
-	WHERE 	submodules.ID = SubmoduleID 
+	WHERE 	submodules.ID = SubmoduleID 	AND
+			modules.isExam = 0
 	LIMIT 1;
     IF NOT (checker > 0) THEN
     	RETURN -1;
@@ -2524,7 +2535,8 @@ BEGIN
 	INNER JOIN `modules` 		ON 	submodules.ModuleID 	= modules.ID
 	INNER JOIN `disciplines` 	ON 	disciplines.ID 			= modules.DisciplineID
 	INNER JOIN `disciplines_teachers` ON disciplines_teachers.DisciplineID = disciplines.ID AND disciplines_teachers.TeacherID 	= TeacherID
-	WHERE 	submodules.ID = SubmoduleID 
+	WHERE 	submodules.ID = SubmoduleID 	AND
+			modules.isExam = 0
 	LIMIT 1;
     IF NOT (checker > 0) THEN
     	RETURN -1;
@@ -2552,7 +2564,8 @@ BEGIN
 	INNER JOIN `modules` ON modules.ID = submodules.ModuleID
 	INNER JOIN `disciplines` ON disciplines.ID = modules.DisciplineID
 	INNER JOIN `disciplines_teachers` ON disciplines_teachers.TeacherID = TeacherID AND disciplines_teachers.DisciplineID = disciplines.ID
-	WHERE 	submodules.ID = SubmoduleID
+	WHERE 	submodules.ID = SubmoduleID 	AND
+			modules.isExam = 0
 	LIMIT 1;
     IF NOT (checker > 0) THEN
     	RETURN -1;
@@ -2643,7 +2656,9 @@ BEGIN
 	INNER JOIN `modules` 		ON 	submodules.ModuleID 	= modules.ID
 	INNER JOIN `disciplines` 	ON 	disciplines.ID 			= modules.DisciplineID
 	INNER JOIN `disciplines_teachers` ON disciplines_teachers.DisciplineID = disciplines.ID AND disciplines_teachers.TeacherID 	= TeacherID
-	WHERE 	submodules.ID = SubmoduleID1 OR submodules.ID = SubmoduleID2;
+	WHERE 	(	submodules.ID = SubmoduleID1 OR 
+				submodules.ID = SubmoduleID2 ) AND
+			modules.isExam = 0;
 	IF checker != 2 THEN
 		RETURN -1;
 	END IF;