diff --git a/src/Uri.cpp b/src/Uri.cpp
index 1219e56..e235b6a 100644
--- a/src/Uri.cpp
+++ b/src/Uri.cpp
@@ -457,6 +457,7 @@ std::string uri_builder::str() const {
         s << '?';
         for (size_t i = 0; i < queries_.size(); ++i)
         {
+			if (i != 0) s << '&';
             s << queries_[i].key << "=";
             HtmlHelper::encode_url_segment(s,queries_[i].value,true);
         }
diff --git a/src/Uri.hpp b/src/Uri.hpp
index 52951f8..11ea763 100644
--- a/src/Uri.hpp
+++ b/src/Uri.hpp
@@ -204,7 +204,7 @@ public:
     bool has_query(const std::string &key) const {
         for (size_t i = 0; i < queries_.size(); ++i)
         {
-            if (queries_[i].key == key) true;
+            if (queries_[i].key == key) return true;
         }
         return false;