diff --git a/handlers/handlerpageview.cpp b/handlers/handlerpageview.cpp
index 441269b..8cf9c7a 100644
--- a/handlers/handlerpageview.cpp
+++ b/handlers/handlerpageview.cpp
@@ -60,7 +60,7 @@ std::string HandlerPageView::createIndexContent(IParser &parser, std::string con
 		}
 		previous = h.level;
 		HtmlLink link;
-		link.href = "#" + h.title;
+		link.href = "#" + utils::strreplace(h.title, " ", "");
 		link.innervalue = h.title;
 		link.cssclass = "indexlink";
 		indexcontent += "<li>" + link.render() + "</li>";
diff --git a/parser.cpp b/parser.cpp
index e260dae..7963267 100644
--- a/parser.cpp
+++ b/parser.cpp
@@ -191,6 +191,10 @@ std::string Parser::parse(const PageDao &pagedao, UrlProvider &provider, const s
 			{
 				newlines = "<br>";
 			}
+			if(tag == "br")
+			{
+				return std::string("<br>");
+			}
 			if(tag != "code" && tag != "blockquote")
 			{
 				content = parse(pagedao, provider, content, callback);
@@ -220,7 +224,7 @@ std::string Parser::parse(const PageDao &pagedao, UrlProvider &provider, const s
 			}
 			if(tag[0] == 'h')
 			{
-				return "<" + tag + " id='" + content + "'>" + content + "</" + tag + ">";
+				return "<" + tag + " id='" + utils::strreplace(content, " ", "") + "'>" + content + "</" + tag + ">";
 			}
 			if(tag == "code" || tag == "blockquote")
 			{