diff --git a/LICENSE.md b/LICENSE.md
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/amd/build/search.min.js b/amd/build/search.min.js
old mode 100644
new mode 100755
diff --git a/amd/src/search.js b/amd/src/search.js
old mode 100644
new mode 100755
diff --git a/classes/output/renderer.php b/classes/output/renderer.php
old mode 100644
new mode 100755
diff --git a/classes/output/searchform.php b/classes/output/searchform.php
old mode 100644
new mode 100755
diff --git a/classes/output/timetable.php b/classes/output/timetable.php
old mode 100644
new mode 100755
diff --git a/classes/timetable.php b/classes/timetable.php
index f14a447..5a225ca 100755
--- a/classes/timetable.php
+++ b/classes/timetable.php
@@ -360,8 +360,9 @@ class timetable {
 			$mylesson['subject'] = $substitution->subjectb; 
                         
 			if ($substitution->subjectb &&
-			    (($this->type == 'teacher' && $this->name   == $substitution->teacherb) ||
-			     ($this->type == 'class'   && $this->name   == $substitution->classb)   ||	
+			    (($this->type == 'teacher' && $this->name   == $substitution->teacherb)   ||
+//			     ($this->type == 'class'   && $this->name   == $substitution->classb)     ||	
+			     ($this->type == 'class'   && strpos($substitution->classb, $this->name)) ||	
 			     ($this->type == 'room'    && $this->name   == $substitution->roomb))
 		           )	{
 			    
@@ -376,8 +377,9 @@ class timetable {
 				}
 		            }
 			    //if ($lesson->week[$this->week-1] != '0') $days[$day]['lessons'][] = $mylesson;
-			} elseif (($this->type == 'teacher' && $this->name   == $substitution->teachera) ||
-				  ($this->type == 'class'   && $this->name   == $substitution->classa)   ||
+			} elseif (($this->type == 'teacher' && $this->name   == $substitution->teachera)   ||
+//				  ($this->type == 'class'   && $this->name   == $substitution->classa)     ||
+				  ($this->type == 'class'   && strpos($substitution->classa, $this->name)) ||	
 				  ($this->type == 'room'    && $this->name   == $substitution->rooma)) {
 			$mylesson['class']   = $substitution->classa;
 			$mylesson['teacher'] = $substitution->teachera; 
diff --git a/db/access.php b/db/access.php
old mode 100644
new mode 100755
diff --git a/db/install.php b/db/install.php
old mode 100644
new mode 100755
diff --git a/db/install.xml b/db/install.xml
old mode 100644
new mode 100755
diff --git a/db/services.php b/db/services.php
old mode 100644
new mode 100755
diff --git a/db/uninstall.php b/db/uninstall.php
old mode 100644
new mode 100755
diff --git a/db/upgrade.php b/db/upgrade.php
old mode 100644
new mode 100755
diff --git a/externallib.php b/externallib.php
old mode 100644
new mode 100755
diff --git a/index.php b/index.php
old mode 100644
new mode 100755
diff --git a/lang/en/timetable.php b/lang/en/timetable.php
old mode 100644
new mode 100755
diff --git a/lib.php b/lib.php
old mode 100644
new mode 100755
diff --git a/mod_form.php b/mod_form.php
old mode 100644
new mode 100755
diff --git a/pix/icon.png b/pix/icon.png
old mode 100644
new mode 100755
diff --git a/pix/icon.svg b/pix/icon.svg
old mode 100644
new mode 100755
diff --git a/settings.php b/settings.php
old mode 100644
new mode 100755
diff --git a/styles.css b/styles.css
old mode 100644
new mode 100755
diff --git a/templates/searchform.mustache b/templates/searchform.mustache
old mode 100644
new mode 100755
diff --git a/templates/searchresult.mustache b/templates/searchresult.mustache
old mode 100644
new mode 100755
diff --git a/templates/timetable.mustache b/templates/timetable.mustache
old mode 100644
new mode 100755
diff --git a/version.php b/version.php
old mode 100644
new mode 100755
diff --git a/view.php b/view.php
old mode 100644
new mode 100755