diff --git a/libmamba/include/mamba/core/query.hpp b/libmamba/include/mamba/core/query.hpp
index cbe1ec5ca0..7211049811 100644
--- a/libmamba/include/mamba/core/query.hpp
+++ b/libmamba/include/mamba/core/query.hpp
@@ -91,11 +91,9 @@ namespace mamba
         [[nodiscard]] static auto find(MPool& pool, const std::vector<std::string>& queries)
             -> QueryResult;
 
-        [[nodiscard]] static auto whoneeds(MPool& pool, const std::string& query, bool tree)
-            -> QueryResult;
+        [[nodiscard]] static auto whoneeds(MPool& pool, std::string query, bool tree) -> QueryResult;
 
-        [[nodiscard]] static auto depends(MPool& pool, const std::string& query, bool tree)
-            -> QueryResult;
+        [[nodiscard]] static auto depends(MPool& pool, std::string query, bool tree) -> QueryResult;
     };
 
     /********************
diff --git a/libmamba/src/core/query.cpp b/libmamba/src/core/query.cpp
index 85a96b465d..befa8dbad0 100644
--- a/libmamba/src/core/query.cpp
+++ b/libmamba/src/core/query.cpp
@@ -228,7 +228,7 @@ namespace mamba
         };
     }
 
-    auto Query::whoneeds(MPool& mpool, const std::string& query, bool tree) -> QueryResult
+    auto Query::whoneeds(MPool& mpool, std::string query, bool tree) -> QueryResult
     {
         if (tree)
         {
@@ -236,7 +236,7 @@ namespace mamba
             {
                 auto walker = PoolWalker(mpool);
                 walker.reverse_walk(std::move(pkg).value());
-                return { QueryType::WhoNeeds, query, std::move(walker).graph() };
+                return { QueryType::WhoNeeds, std::move(query), std::move(walker).graph() };
             }
         }
         else
@@ -246,12 +246,12 @@ namespace mamba
                 specs::MatchSpec::parse(query),
                 [&](specs::PackageInfo&& pkg) { g.add_node(std::move(pkg)); }
             );
-            return { QueryType::WhoNeeds, query, std::move(g) };
+            return { QueryType::WhoNeeds, std::move(query), std::move(g) };
         }
-        return { QueryType::WhoNeeds, query, QueryResult::dependency_graph() };
+        return { QueryType::WhoNeeds, std::move(query), QueryResult::dependency_graph() };
     }
 
-    auto Query::depends(MPool& mpool, const std::string& query, bool tree) -> QueryResult
+    auto Query::depends(MPool& mpool, std::string query, bool tree) -> QueryResult
     {
         if (auto pkg = pool_latest_package(mpool, specs::MatchSpec::parse(query)))
         {
@@ -264,9 +264,9 @@ namespace mamba
             {
                 walker.walk(std::move(pkg).value(), 1);
             }
-            return { QueryType::Depends, query, std::move(walker).graph() };
+            return { QueryType::Depends, std::move(query), std::move(walker).graph() };
         }
-        return { QueryType::Depends, query, QueryResult::dependency_graph() };
+        return { QueryType::Depends, std::move(query), QueryResult::dependency_graph() };
     }
 
     /********************************