diff --git a/src/rule.cc b/src/rule.cc
index 460695e4..9cc09b72 100644
--- a/src/rule.cc
+++ b/src/rule.cc
@@ -580,10 +580,11 @@ bool Rule::evaluate(Transaction *trasn) {
 #endif
                             }
                         } else if (!a->isDisruptive()) {
-                            // here
-                            if (a->m_name != "capture" && a->m_name != "setvar") {
+                            if (a->m_name != "capture" \
+                                && a->m_name != "setvar") {
 #ifndef NO_LOGS
-                                trasn->debug(4, "Running [II] (_non_ disruptive) " \
+                                trasn->debug(4, "Running [II] " \
+                                    "(_non_ disruptive) " \
                                     "action: " + a->m_name);
 #endif
                                 a->evaluate(this, trasn, ruleMessage);
diff --git a/src/transaction.cc b/src/transaction.cc
index ccf08652..e9ca8759 100644
--- a/src/transaction.cc
+++ b/src/transaction.cc
@@ -415,7 +415,7 @@ int Transaction::processURI(const char *uri, const char *method,
     m_collections.store("REQUEST_PROTOCOL",
         "HTTP/" + std::string(http_version));
 
-    std::string parsedURI = uri;
+    std::string parsedURI = m_uri_decoded;
     // The more popular case is without domain
     if (!m_uri_decoded.empty() && m_uri_decoded.at(0) != '/') {
         bool fullDomain = true;