diff --git a/README.md b/README.md
index 56e3158d..672b7cb5 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ This repo is used to capture architectural and design decisions as a reference o
 |[ADR-5](adr/ADR-5.md)|server, client|Lame Duck Notification|
 |[ADR-6](adr/ADR-6.md)|server, client|Naming Rules|
 |[ADR-7](adr/ADR-7.md)|server, client, jetstream|NATS Server Error Codes|
-|[ADR-8](adr/ADR-8.md)|jetstream, client, kv|JetStream based Key-Value Stores|
+|[ADR-8](adr/ADR-8.md)|jetstream, client, kv, spec|JetStream based Key-Value Stores|
 |[ADR-9](adr/ADR-9.md)|server, client, jetstream|JetStream Consumer Idle Heartbeats|
 |[ADR-10](adr/ADR-10.md)|server, client, jetstream|JetStream Extended Purge|
 |[ADR-11](adr/ADR-11.md)|client|Hostname resolution|
@@ -29,11 +29,11 @@ This repo is used to capture architectural and design decisions as a reference o
 |[ADR-21](adr/ADR-21.md)|client|NATS Configuration Contexts|
 |[ADR-22](adr/ADR-22.md)|jetstream, client|JetStream Publish Retries on No Responders|
 |[ADR-31](adr/ADR-31.md)|jetstream, client, server|JetStream Direct Get|
-|[ADR-32](adr/ADR-32.md)|client|Service API|
+|[ADR-32](adr/ADR-32.md)|client, spec|Service API|
 |[ADR-33](adr/ADR-33.md)|jetstream, client, server|Metadata for Stream and Consumer|
 |[ADR-34](adr/ADR-34.md)|jetstream, client, server|JetStream Consumers Multiple Filters|
 |[ADR-36](adr/ADR-36.md)|jetstream, client, server|Subject Mapping Transforms in Streams|
-|[ADR-37](adr/ADR-37.md)|jetstream, client|JetStream Simplification|
+|[ADR-37](adr/ADR-37.md)|jetstream, client, spec|JetStream Simplification|
 
 ## Jetstream
 
@@ -42,7 +42,7 @@ This repo is used to capture architectural and design decisions as a reference o
 |[ADR-1](adr/ADR-1.md)|jetstream, client, server|JetStream JSON API Design|
 |[ADR-2](adr/ADR-2.md)|jetstream, server, client|NATS Typed Messages|
 |[ADR-7](adr/ADR-7.md)|server, client, jetstream|NATS Server Error Codes|
-|[ADR-8](adr/ADR-8.md)|jetstream, client, kv|JetStream based Key-Value Stores|
+|[ADR-8](adr/ADR-8.md)|jetstream, client, kv, spec|JetStream based Key-Value Stores|
 |[ADR-9](adr/ADR-9.md)|server, client, jetstream|JetStream Consumer Idle Heartbeats|
 |[ADR-10](adr/ADR-10.md)|server, client, jetstream|JetStream Extended Purge|
 |[ADR-12](adr/ADR-12.md)|jetstream|JetStream Encryption At Rest|
@@ -57,13 +57,13 @@ This repo is used to capture architectural and design decisions as a reference o
 |[ADR-33](adr/ADR-33.md)|jetstream, client, server|Metadata for Stream and Consumer|
 |[ADR-34](adr/ADR-34.md)|jetstream, client, server|JetStream Consumers Multiple Filters|
 |[ADR-36](adr/ADR-36.md)|jetstream, client, server|Subject Mapping Transforms in Streams|
-|[ADR-37](adr/ADR-37.md)|jetstream, client|JetStream Simplification|
+|[ADR-37](adr/ADR-37.md)|jetstream, client, spec|JetStream Simplification|
 
 ## Kv
 
 |Index|Tags|Description|
 |-----|----|-----------|
-|[ADR-8](adr/ADR-8.md)|jetstream, client, kv|JetStream based Key-Value Stores|
+|[ADR-8](adr/ADR-8.md)|jetstream, client, kv, spec|JetStream based Key-Value Stores|
 |[ADR-19](adr/ADR-19.md)|jetstream, client, kv, objectstore|API prefixes for materialized JetStream views|
 
 ## Objectstore
@@ -114,6 +114,9 @@ This repo is used to capture architectural and design decisions as a reference o
 
 |Index|Tags|Description|
 |-----|----|-----------|
+|[ADR-8](adr/ADR-8.md)|jetstream, client, kv, spec|JetStream based Key-Value Stores|
+|[ADR-32](adr/ADR-32.md)|client, spec|Service API|
+|[ADR-37](adr/ADR-37.md)|jetstream, client, spec|JetStream Simplification|
 |[ADR-40](adr/ADR-40.md)|spec|NATS Connection|
 
 ## When to write an ADR