diff --git a/arangod/Cluster/DBServerAgencySync.cpp b/arangod/Cluster/DBServerAgencySync.cpp
index ed835749b9..ac6ef0b2d0 100644
--- a/arangod/Cluster/DBServerAgencySync.cpp
+++ b/arangod/Cluster/DBServerAgencySync.cpp
@@ -90,7 +90,8 @@ Result DBServerAgencySync::getLocalCollections(VPackBuilder& collections) {
 
           collections.add(VPackValue(colname));
           VPackObjectBuilder col(&collections);
-          collection->properties(collections, /*detailed*/true, false);
+          collection->properties(collections, /*detailed*/true,
+                                 /*forPersistence*/false);
 
           auto const& folls = collection->followers();
           std::string const theLeader = folls->getLeader();
diff --git a/arangod/VocBase/LogicalCollection.cpp b/arangod/VocBase/LogicalCollection.cpp
index 7883650d55..03fb286a8d 100644
--- a/arangod/VocBase/LogicalCollection.cpp
+++ b/arangod/VocBase/LogicalCollection.cpp
@@ -641,14 +641,15 @@ arangodb::Result LogicalCollection::appendVelocyPack(arangodb::velocypack::Build
   // Indexes
   result.add(VPackValue("indexes"));
   auto flags = Index::makeFlags();
-  // FIXME simon: hide links here, but increase chance of ASAN errors
-  /*auto filter = [&](arangodb::Index const* idx) { // hide hidden indexes
+  // hide hidden indexes. In effect hides unfinished indexes,
+  // and iResearch links (only on a single-server and coordinator)
+  auto filter = [&](arangodb::Index const* idx) {
      return (forPersistence || !idx->isHidden());
-   };*/
+   };
   if (forPersistence) {
     flags = Index::makeFlags(Index::Serialize::Internals);
   }
-  getIndexesVPack(result, flags/*, filter*/);
+  getIndexesVPack(result, flags, filter);
 
   // Cluster Specific
   result.add(StaticStrings::IsSmart, VPackValue(_isSmart));