diff --git a/src/window.cpp b/src/window.cpp
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -340,7 +340,7 @@ Scrollbar *Window::GetScrollbar(uint wid
  */
 const QueryString *Window::GetQueryString(uint widnum) const
 {
-	auto query = this->querystrings.Find(widnum);
+	auto query = this->querystrings.find(widnum);
 	return query != this->querystrings.end() ? query->second : nullptr;
 }
 
@@ -351,8 +351,8 @@ const QueryString *Window::GetQueryStrin
  */
 QueryString *Window::GetQueryString(uint widnum)
 {
-	SmallMap<int, QueryString*>::Pair *query = this->querystrings.Find(widnum);
-	return query != this->querystrings.End() ? query->second : nullptr;
+	auto query = this->querystrings.find(widnum);
+	return query != this->querystrings.end() ? query->second : nullptr;
 }
 
 /**
@@ -360,8 +360,7 @@ QueryString *Window::GetQueryString(uint
  */
 void Window::UpdateQueryStringSize()
 {
-	for (auto &qs : this->querystrings)
-	{
+	for (auto &qs : this->querystrings) {
 		qs.second->text.UpdateSize();
 	}
 }
@@ -1912,7 +1911,7 @@ static void DecreaseWindowCounters()
 		}
 
 		/* Handle editboxes */
-		for (SmallMap<int, QueryString*>::Pair &pair : w->querystrings) {
+		for (auto &pair : w->querystrings) {
 			pair.second->HandleEditBox(w, pair.first);
 		}