Revert "Revert "Address comments""

This reverts commit ab2209d.

Author: karenrasmussen

src/annotator/integrations/html-metadata.ts

@@ -121,16 +121,16 @@ export class HTMLMetadata {
     let version: number | null = null;
 
     for (const candidate of candidates) {
-      const potential_version = this._findVersion(candidate);
-      if (!potential_version) {
+      const potentialVersion = this._findVersion(candidate);
+      if (!potentialVersion) {
         return null;
       }
 
       // If the version is not set, set it to the potential version.
       // If the version is set and the potential version is different, return null.
       if (version === null) {
-        version = potential_version;
-      } else if (version !== potential_version) {
+        version = potentialVersion;
+      } else if (version !== potentialVersion) {
         return null;
       }
     }

src/sidebar/store/modules/frames.ts

@@ -190,14 +190,11 @@ function searchUrisForFrame(frame: Frame): string[] {
 
   // If the document has a version, append a version suffix to each URI.
   // v0 is the base version and should not be appended.
-  // Only v1 includes v0 annotations (`:v0:v1`), other versions only search their own (`:v{version}`).
+  // Only v1 includes v0 annotations (`:v0:v{version}`), other versions only search their own (`:v{version}`).
   const version = frame.metadata?.version;
   if (version && version > 0) {
-    if (version === 1) {
-      uris = uris.map(uri => `${uri}:v0:v1`);
-    } else {
-      uris = uris.map(uri => `${uri}:v${version}`);
-    }
+    const versionSuffix = version === 1 ? `:v0:v${version}` : `:v${version}`;
+    uris = uris.map(uri => `${uri}${versionSuffix}`);
   }
 
   return uris;