diff --git a/modules/matlab/generator/filters.py b/modules/matlab/generator/filters.py
index d712c321cb..0ae371c4c0 100644
--- a/modules/matlab/generator/filters.py
+++ b/modules/matlab/generator/filters.py
@@ -92,7 +92,11 @@ def toUnderCase(text):
 def stripTags(text):
     upper = lambda pattern: pattern.group(1).upper()
     text = re.sub('<code>(.*?)</code>', upper, text)
-    text = re.sub('<(.*?)>', '', text)
+    text = re.sub('<([^=\s].*?)>', '', text)
+    text = re.sub('&lt', '<', text)
+    text = re.sub('&gt', '>', text)
+    text = re.sub('&le', '<=', text)
+    text = re.sub('&ge', '>=', text)
     return text
 
 def qualify(text, name):
diff --git a/modules/matlab/generator/templates/template_map_base.m b/modules/matlab/generator/templates/template_map_base.m
index 5bea782d17..7c2cc2bc85 100644
--- a/modules/matlab/generator/templates/template_map_base.m
+++ b/modules/matlab/generator/templates/template_map_base.m
@@ -43,14 +43,14 @@
 % bug report to the OpenCV team, you can get a printout of diagnostic 
 % information to submit along with your report by typing:
 %
-%     cv.buildInformation();
+%     <a href="matlab: cv.buildInformation()">cv.buildInformation();</a>
 %
 % <strong>OTHER RESOURCES</strong>
 % OpenCV documentation online: <a href="matlab: web('http://docs.opencv.org', '-browser')">http://docs.opencv.org</a>
 % OpenCV issue tracker: <a href="matlab: web('http://code.opencv.org', '-browser')">http://code.opencv.org</a>
 % OpenCV Q&A: <a href="matlab: web('http://answers.opencv.org', '-browser')">http://answers.opencv.org</a>
 %
-% See also: cv.help, cv.buildInformation
+% See also: cv.help, <a href="matlab: cv.buildInformation()">cv.buildInformation</a>
 %
 % Copyright {{ time.strftime("%Y", time.localtime()) }} The OpenCV Foundation
 %