4 files changed, 16 insertions, 9 deletions
diff --git a/library/src/meta/counter.rs b/library/src/meta/counter.rs
index 50a097af..5c23c536 100644
--- a/library/src/meta/counter.rs
+++ b/library/src/meta/counter.rs
@@ -396,7 +396,7 @@ impl Counter {
         self.sequence_impl(
             vt.world,
             TrackedMut::reborrow_mut(&mut vt.tracer),
-            TrackedMut::reborrow_mut(&mut vt.provider),
+            vt.locator.track(),
             vt.introspector,
         )
     }
@@ -407,10 +407,11 @@ impl Counter {
         &self,
         world: Tracked<dyn World + '_>,
         tracer: TrackedMut<Tracer>,
-        provider: TrackedMut<StabilityProvider>,
+        locator: Tracked<Locator>,
         introspector: Tracked<Introspector>,
     ) -> SourceResult<EcoVec<(CounterState, NonZeroUsize)>> {
-        let mut vt = Vt { world, tracer, provider, introspector };
+        let mut locator = Locator::chained(locator);
+        let mut vt = Vt { world, tracer, locator: &mut locator, introspector };
         let mut state = CounterState(match &self.0 {
             // special case, because pages always start at one.
             CounterKey::Page => smallvec![1],
diff --git a/library/src/meta/query.rs b/library/src/meta/query.rs
index 9488a964..4db658d7 100644
--- a/library/src/meta/query.rs
+++ b/library/src/meta/query.rs
@@ -122,7 +122,12 @@ pub fn query(
     location: Location,
 ) -> Value {
     let _ = location;
-    vm.vt.introspector.query(&target.0).into()
+    let vec = vm.vt.introspector.query(&target.0);
+    Value::Array(
+        vec.into_iter()
+            .map(|elem| Value::Content(elem.into_inner()))
+            .collect(),
+    )
 }
 
 /// Turns a value into a selector. The following values are accepted:
diff --git a/library/src/meta/reference.rs b/library/src/meta/reference.rs
index 68837b89..ceb1a3b2 100644
--- a/library/src/meta/reference.rs
+++ b/library/src/meta/reference.rs
@@ -130,7 +130,7 @@ impl Synthesize for RefElem {
         let target = self.target();
         if vt.introspector.init() && !BibliographyElem::has(vt, &target.0) {
             if let Ok(elem) = vt.introspector.query_label(&target) {
-                self.push_element(Some(elem));
+                self.push_element(Some(elem.into_inner()));
                 return Ok(());
             }
         }
@@ -173,7 +173,7 @@ impl Show for RefElem {
         let supplement = match self.supplement(styles) {
             Smart::Auto | Smart::Custom(None) => None,
             Smart::Custom(Some(supplement)) => {
-                Some(supplement.resolve(vt, [elem.clone().into()])?)
+                Some(supplement.resolve(vt, [(*elem).clone().into()])?)
             }
         };
 
diff --git a/library/src/meta/state.rs b/library/src/meta/state.rs
index b466bd66..33c3b595 100644
--- a/library/src/meta/state.rs
+++ b/library/src/meta/state.rs
@@ -311,7 +311,7 @@ impl State {
         self.sequence_impl(
             vt.world,
             TrackedMut::reborrow_mut(&mut vt.tracer),
-            TrackedMut::reborrow_mut(&mut vt.provider),
+            vt.locator.track(),
             vt.introspector,
         )
     }
@@ -322,10 +322,11 @@ impl State {
         &self,
         world: Tracked<dyn World + '_>,
         tracer: TrackedMut<Tracer>,
-        provider: TrackedMut<StabilityProvider>,
+        locator: Tracked<Locator>,
         introspector: Tracked<Introspector>,
     ) -> SourceResult<EcoVec<Value>> {
-        let mut vt = Vt { world, tracer, provider, introspector };
+        let mut locator = Locator::chained(locator);
+        let mut vt = Vt { world, tracer, locator: &mut locator, introspector };
         let mut state = self.init.clone();
         let mut stops = eco_vec![state.clone()];