diff --git a/src/storage/v3/request_helper.hpp b/src/storage/v3/request_helper.hpp
index 309902645..5a065c3c9 100644
--- a/src/storage/v3/request_helper.hpp
+++ b/src/storage/v3/request_helper.hpp
@@ -117,11 +117,11 @@ struct Element {
   TObjectAccessor object_acc;
 };
 
-template <typename TIterable>
+template <typename T>
+concept IDontKnowAGoodNameForThis = utils::SameAsAnyOf<T, VerticesIterable, std::vector<VertexAccessor>>
+template <IDontKnowAGoodNameForThis TIterable>
 std::vector<Element<VertexAccessor>> OrderByVertices(Shard::Accessor &acc, DbAccessor &dba, TIterable &iterable,
                                                      std::vector<msgs::OrderBy> &order_bys) {
-  static_assert(std::is_same_v<TIterable, VerticesIterable> || std::is_same_v<TIterable, std::vector<VertexAccessor>>);
-
   std::vector<Ordering> ordering;
   ordering.reserve(order_bys.size());
   std::transform(order_bys.begin(), order_bys.end(), std::back_inserter(ordering), [](const auto &order_by) {
diff --git a/src/storage/v3/shard_rsm.cpp b/src/storage/v3/shard_rsm.cpp
index 88aa028e6..37949d41d 100644
--- a/src/storage/v3/shard_rsm.cpp
+++ b/src/storage/v3/shard_rsm.cpp
@@ -563,7 +563,7 @@ msgs::ReadResponses ShardRsm::HandleRead(msgs::ExpandOneRequest &&req) {
       break;
     }
 
-    results.emplace_back(maybe_result.value());
+    results.emplace_back(std::move(maybe_result.value()));
     if (batch_limit.has_value() && results.size() >= batch_limit.value()) {
       break;
     }